Event fixes
Merge pull request #85 from lukaswelte/event-fixes

Event fixes