First pass at #178
Merge pull request #906 from anmonteiro/patch-1

First pass at #178