Merge pull request #4 from fsiaonma/master

merge
提交修改
Merge branch 'master' of git@github.com:TingoZhou/x-canvas-tmp.git
提交
merge