Finishing Emoticon support
Merge pull request #49 from Alanaktion/emoticons

Finishing Emoticon support