Merge pull request #24 from 2betop/master

小调整
Merge pull request #25 from 2betop/master

提交代码
filepaste
Merge pull request #26 from yeol/master

filepaste
调整代码
修复conflict