Fixes #111

Minor change
Merge pull request #115 from avoidwork/0.8.x.edge

Minor change