fixes #6
Merge pull request #14 from Tjoosten/Development

fixes #6