Merge pull request #5 from ndavis10/master

Update