apply @MattiJarvinen patch from issue #75
Merge pull request #85 from robocoder/issue-75

apply @MattiJarvinen patch from issue #75