Fixes event container stuff
Merge pull request #1 from collective/event_container

Fixes event container stuff