Maybe fixes Issue #191
Merge pull request #192 from johan12345/master

Maybe fixes Issue #191