Merge pull request #26 from singhdd93/cm-10.1

Cm 10.1
cleanup
Merge pull request #1 from PAC-man/cm-10.1

Cm 10.1