提交代码
Merge pull request #20 from 2betop/master

提交代码
小修改
小修改
Merge pull request #21 from 2betop/master

提交代码
Merge pull request #8 from gmuteam/master

sync master