Merge pull request #7 from mourta/cm-11.0

Fixes and worthwhile governors