improved event data
Merge pull request #4 from webcreate/better-event-handling

improved event data