Merge pull request #1 from ndavis10/master

update from upstream
Merge pull request #6 from mdeboer1/master

Merge pull request #1 from ndavis10/master