Aanpassingen issue#6
Merge pull request #7 from janseba/issue#6

Aanpassingen issue#6