Merge pull request #1 from NYTimes/master

merged from NYTimes/master