Merge pull request #942 from JordanMussi/feature-smilies

Fixes #902 Smilies Improvements