added cm support
CM support
Merge pull request #3 from Klozz/master

Some CM bringh