Fix call to eventemitter
Merge pull request #42 from chamerling/master

Fix calls to EventEmitter