Merge pull request #1 from mojombo/master

updating