bugs fixes and enhancements
Merge branch 'master' of https://github.com/jasonmimick/cim