Merge pull request #1 from sethvincent/master

update