Merge pull request #5 from ndavis10/master

Update
Merge pull request #20 from Barterdm04/master

Merge pull request #5 from ndavis10/master