Merge pull request #8 from ndavis10/master

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

load from upstream