Merge pull request #25 from mdeboer1
Merge pull request #26 from Barterdm04/master

Merge pull request #6 from ndavis10/master
Merge pull request #7 from ndavis10/master

update