fix eventType del
Merge remote-tracking branch 'origin/master'