improve event cmp design
Merge pull request #68 from christopheschwyzer/issue-68

improve event design