Merge pull request #4 from ndavis10/master

update from upstream