Merge pull request #1 from mengyanyl/master

合并作者代码