Merge pull request #2 from julycoding/master

Merge pull request  from julycoding/master
Merge pull request #336 from zhemingwang/master

Merge pull request #3 from julycoding/master