Merge pull request #1 from szezso/cm-11.0

update from szezso