Merge pull request #2 from szezso/cm-11.0

update from szezso