Merge pull request #4 from jrob119/Latest

Merge pull request #3 from jrob119/3170
Merge pull request #5 from jrob119/3170

Merge pull request #4 from jrob119/Latest