small changes for joe, so he can carry on his simulation, we should change it back for final submission
Merge branch 'master' of https://github.com/paulstaab/scrm