Fixes #608
Merge pull request #609 from myqlarson/blah

Fixes #608