Fix for #242
Merge pull request #245 from aesedepece/master

Fix for #242