Merge pull request #6 from ndavis10/master

updating