cleanup
Merge pull request #3 from vkammerer/events

cleanup