Merge pull request #1 from todbot/master

update from original