Merge pull request #4 from js3dev/develop

Develop
Merge pull request #5 from js3dev/master

h