Fixes #295
Merge pull request #296 from athanclark/iss295

Fixes #295