Bugfix events controller
Merge pull request #221 from ChrisBr/bugfix_event

Bugfix events controller