Fixes issue #89
Merge pull request #90 from heiglandreas/hotfix/#89

Fixes issue #89