update to new events system
Merge pull request #12 from danielneis/events-update

update to new events system