Merge pull request #6 from zhangcd/master

ff
Merge branch 'master' of https://github.com/zhangcd/shaping