Allow for non-class events. Fixes issue #9
Merge branch 'issue9'