Merge pull request #6 from nousxiong/develop

Develop