Merge pull request #4 from ryanhoo/develop

Develop
Merge remote-tracking branch 'upstream/develop' into develop