Bugfixes na merge
Merge pull request #101 from MPieter/master

Bugfixes na merge