Merge pull request #20 from wildewouter/feature/ISSUE7

Feature/issue7 merged into develop
Merge branch 'develop' into feature/ISSUE21