Merge pull request #7 from ndavis10/master

update
Merge pull request #31 from Barterdm04/master

Merge pull request #7 from ndavis10/master