Merge pull request #1 from metamx/master

Updated