Fixes issue #241
Merge pull request #245 from LightGuard/issue_241

Fixes issue #241