karma port
Merge branch 'master' of https://github.com/xuender/cm