Switch to v0.2.2 of eventsystem
Merge branch 'eventsystem-v0.2.2'