Merge CM
Merge pull request #1 from BULLDOZ3/jb-mr1

Merge CM