First pass at issue #237
Merge pull request #701 from j4yd0rs3y/patch-3

First pass at issue #237