First pass at #323
Merge pull request #940 from anmonteiro/patch-1

First pass at #323