Merge pull request #2 from ndavis10/master

update to upstream
Merge pull request #3 from ndavis10/master

Trying not to explode things
Merge pull request #12 from mdeboer1/master

Test