First pass at #138
Merge pull request #921 from anmonteiro/patch-1

First pass at #138