Little bit more cleanup and make the cm.mk better
Merge pull request #4 from deadman96385/cm-11.0

Little bit more cleanup and make the cm.mk better