Fix #363

Fix #363
Merge pull request #365 from mysticdrew/master

Fix for #363