Merge pull request #3 from yangtzeu/develop

Develop