Merge pull request #5 from paullianyang/develop

Develop