Merge pull request #4 from zifnab06/master

Fixes to /cm