fixed PROBCORE-303
some minor changes
Merge branch 'develop' of github.com:bendisposto/prob2 into develop