Fixes #79
Merge pull request #83 from heiglandreas/hotfix/#79

Fixes #79