Merge pull request #1 from kguischard13/master

updates
Merge pull request #3 from RalphGorham05/master

Merge pull request #1 from kguischard13/master