Merge pull request #1 from yujie13312963854/master

获取原作者修改
完成
Merge pull request #3 from BlackPearl2014/master

已经合并了提交，余杰