Fixing custom events
Merge pull request #230 from mariomc/fixCustomEvents2

Fixing custom events