Unit test for simCtrl
merge changes
Merge branch 'master' of https://github.com/SIMProject/SIM
merging changes
Merge branch 'master' of https://github.com/SIMProject/SIM