Add t-comment plugin
Merge branch 'add-comment-plugin'