Fixes #80
Merge pull request #84 from heiglandreas/hotfix/#80

Fixes #80