Merge pull request #1 from rasave01/master

Merge pull request #1 from gmurph05/master
Merge pull request #2 from gmurph05/master

Second pull request