Merge branch 'comment-feature' close #8