Merge pull request #6 from jurasm2/develop

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