commit by jonsan
Merge branch 'master' of https://github.com/guojiangshan/canyin