added support for events
v0.2.x update