Fixed failed issue
Merge pull request #17 from karencatearabit/cm-16

merge cm-16 to dev_1.0