Merge pull request #2 from ndavis10/master

Update from upstream
Merge pull request #13 from mcarpenter5/master

Update from upstream