Fix bug, chang return format of eventhandler
Merge pull request #27 from AncientAnton/master

Fix bug, chang return format of eventhandler