Fix CM build
Merge pull request #1 from Faryaab/cm-10.1

Fix CM build