Fixes #149
Merge pull request #150 from lindegroup/fix-#149

Fixes #149