events fixes
Merge pull request #252 from glenwks/master

events fixes