Merge upstream
Merge pull request #13 from Owain94/cm-11.0

Merge upstream