Merge pull request #1 from julycoding/master

合并原作者的更新
Merge pull request #312 from zhemingwang/master

Merge pull request #1 from julycoding/master