fixes #10
Merge pull request #15 from Tjoosten/Development

fixes #10