rectify events bugs
Merge pull request #258 from glenwks/master

rectify events bugs