Bring up to date with CM
Merge pull request #7 from Absol31/cm-11.0

Bring up to date with CM