Merge pull request #14 from implydata/update-event