Merge pull request #304 from github/working-with-comments