Merge branch 'release-0.1' into develop
Merge pull request #1 from michelgrootjans/develop

Merge branch 'release-0.1' into develop