finalizing event changes bug fixing
Merge pull request #256 from glenwks/master

finalizing event changes bug fixing