RvBurik Merge pull request #31 from topicusonderwijs/DZ-4157