Merge branch 'jc/custom-comment-char'