Merge pull request #1 from mcxiaoke/master

pull