Revert "Revert "Merge pull request #10 from iiD4x/cm-11.0""

This reverts commit 2b922aa450738735678c67cd160759ecd2258e21.