Merge pull request #24 from oncletom/master

Removed eventEmitter dependency