Merge pull request #1 from thinkgem/master

同步原作者的代码
Merge pull request #2 from thinkgem/master

更新作者代码
Merge pull request #135 from Ivan0626/master

Merge pull request #1 from thinkgem/master