Merge pull request #7 from ndavis10/master

load from upstream
Merge pull request #28 from mdeboer1/master

load from upstream