Merge CM latest Changes
Build changes
Merge pull request #2 from IOAP/master

Merge CM latest Changes