Fixes #259 and 242
Merge pull request #263 from aesedepece/fix-for-issue-259

Fixes #259 and 242