Merge pull request #136 from glenwks/master

minor edit edit and delete events
Merge remote-tracking branch 'upstream2/master'