fixes #25
Merge pull request #28 from wscherphof/#25

fixes #25