Merge pull request #108 from razrqcom-dev-team/cm-10.2

Cm 10.2