Requirements 3 & 4
Merge branch 'master' of https://github.com/codebrain/CM