Merge pull request #84 from jjacobskind/event-listener-bugfix

Event listener bugfix
Revert "Event listener bugfix"
Merge pull request #85 from jjacobskind/revert-84-event-listener-bugfix

Revert "Event listener bugfix"
Resolved merge conflicts