Merge pull request #5 from nousxiong/develop

Develop