Merge pull request #3 from yangtzeu/develop

Develop
Merge pull request #4 from yangtzeu/master

Merge pull request #3 from yangtzeu/develop