Merge pull request #2 from bananaxzw/master

请求
代码整理
Merge pull request #3 from yuyepaoniu/master

代码整理