Merge branch 'devel' of mmka:unres into devel