Merge pull request #671 from totten/rest-comments