First pass at #432
Merge pull request #896 from elcapo/patch-5

First pass at #432