Merge pull request #1 from Gamersab/cm-12.0-work

Cm 12.0 work
Updates