Merge pull request #1 from twitter/master