Merge pull request #29 from bvssvni/master

Rename `update` to `event`
Merge pull request #32 from bvssvni/master

Use GenericEvent