First pass at #278
Merge pull request #969 from elcapo/patch-16

First pass at #278