Emotion!
Merge pull request #2 from HenriLangenhoven/hotfix

Emotion!