Merge pull request #130 from glenwks/master

new fix editevent