fixed local event handling
merged master
Merge pull request #2 from coderly/fix-local-event-handling

fixed local event handling