Merge pull request #1 from ndavis10/master

Update from upstream