Updated cm conversion function and fixed serial issue
Merge branch 'master' of https://github.com/GulliverJ/Group10