First pass at #107
Merge pull request #1031 from anmonteiro/patch-1

First pass at #107