fixes
Merge pull request #9 from Optima-Team/cm-11.0

fixes