fixes issue #87
Merge pull request #89 from fabian-s/master

fixes issue #87