Emotion!
Merge pull request #2 from HenriLangenhoven/hotfix

Emotion!
Merge branch 'refs/heads/master' into develop