First pass at #159
Merge pull request #892 from elcapo/patch-2

First pass at #159