Merge pull request #17 from PAC-man/cm-10.1