Merge branch 'master' into develop
Merge pull request #45 from woutervanwijk/develop

Merge branch 'master' into develop