Merge pull request #2 from tongqqiu/develop

Develop
Merge pull request #3 from tongqqiu/master

Merge pull request #2 from tongqqiu/develop