Issue #239
Merge pull request #245 from LordRiffRaff/master

Issue #239 Fix