Removing the listener/emiter of #120
Merge pull request #142 from skifan/patch-1

Removing the listener/emiter of #120