Merge pull request #1 from Quarx2k/cm-11.0

merge