Add emoticon support
Merge pull request #56 from alquerci/emoticons

Add emoticon support