Merge pull request #3 from bananaxzw/master

代码整理
代码整理
Merge pull request #4 from yuyepaoniu/master

代码整理