First pass at #232
Merge pull request #891 from elcapo/patch-1

First pass at #232