Fixes #244
Merge pull request #428 from larkio/master

Fixes #244