Merge pull request #1 from TeamCanjica/cm-11.0

Update