Added emoticon support for comments