First pass at #351
Merge pull request #950 from elcapo/patch-14

First pass at #351