First Pass #984
Merge pull request #987 from knoxzin1/patch-1

First Pass #984