Merge pull request #1 from gmurph05/master

pulled all
Merge pull request #1 from rasave01/master

Merge pull request #1 from gmurph05/master