Merge pull request #3 from ryanhoo/develop

Develop
Merge remote-tracking branch 'upstream/develop' into develop
Merge pull request #4 from ryanhoo/develop

Develop
chore: remove unused code
Merge remote-tracking branch 'upstream/develop' into develop