Fixes #436
Merge pull request #438 from roycehaynes/master

Fixes #436