bug fixes for MARS and MAS
Merge branch 'master' of https://github.com/digitalabs/IBPWorkbench