Corrected event object handling
Corrected clockwork tests for event handling
Merge pull request #83 from rationalrevolt/master

Corrected event object handling