First Pass #990
Merge pull request #993 from knoxzin1/patch-2

First Pass #990