eventListener on/off
resolved conflicts
Merge pull request #17 from ckammerl/eventListener

Event listener