Merge pull request #1 from KonstaT/cm-10.1

Cm 10.1