Merge pull request #4 from ndavis10/master

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

Merge pull request #4 from ndavis10/master