First pass at #76
Merge pull request #788 from vincentbarr/patch-1

First pass at #76