Merge pull request #4 from t11a/develop

Develop
Merge remote-tracking branch 'origin/master' into develop
Merge remote-tracking branch 'origin/develop' into feature-test