Merge pull request #2 from todbot/master

update