Merge pull request #1 from squidsolutions/master

event model update
Merge pull request #2 from squidsolutions/release

Merge pull request #1 from squidsolutions/master