Initial commit for serrano
Merge pull request #266 from arco/cm-10.1

Initial commit for serrano