cleanup2
Merge pull request #4 from vkammerer/events

cleanup2