Merge branch 'hotfix-1.1'
Merge branch 'master' of https://github.com/zhaoxb/cypherm