first part of Build Fix
Merge branch 'develop' of https://github.com/bendisposto/prob2 into develop