Merge pull request #18 from Kagetsuki/master

lots of improvements
added new emoji