Merge pull request #1 from geksong/master

合并原作者的更新
Merge pull request #2 from geksong/master

同步新代码
Merge pull request #1 from zx-li/master

Merge pull request #1 from geksong/master