addressed some major and critical issues
Merge branch 'master' of https://github.com/moontwink/CIsys