event model update
Merge pull request #73 from SW2A305/events

event model update