derps

Please enter the commit message for your changes. Lines starting
Merge pull request #3 from galaxyfreak/cm-11.0

derps