First pass at issue #379
Merge pull request #669 from j4yd0rs3y/patch-1

First pass at issue #379