add comments for Event Handler
Merge remote-tracking branch 'origin'
minor edit