Merge branch 'bartek' of mmka:unres into bartek