Tries to get rid of EventHandler to solve #402 and #404
Merge pull request #311 from agueganno/402-without-Eventhandler

Tries to get rid of EventHandler to solve #402 and #404