final improvements
Merge branch 'master' of mpb.li:orgarec