Fixes #305
Merge pull request #313 from WoodStone/master

Fixes #305