Merge pull request #3 from whiperhack/master

update
updated
updates
Merge pull request #4 from whiperhack/cm-11.0

Cm 11.0