Minor Code Clean Up and Bug Fix
Merge branch 'master' of https://github.com/kai33/Proj_CICMS