major changes in event
Merge pull request #272 from KodeKracker/master

major changes in event