Fixed minor bugs
Merge branch 'master' of https://github.com/kai33/Proj_CICMS