First pass at #192
Merge pull request #795 from vincentbarr/patch-2

First pass at #192