minor fixes
Merge branch 'master' of https://github.com/lernerc/IMS3660
Merge branch 'master' of https://github.com/lernerc/IMS3660