Merge pull request #2 from scarwu/develop

Develop