continuing event system
Merge pull request #157 from mtnlife999/master

continuing event system