Compatible with more Hihibox's emoticons
Merge remote-tracking branch 'origin/master' into gh-pages