Merge pull request #43 from OkayX6/develop

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