Merge pull request #7 from ndavis10/master

update