Fix events handlers
Merge pull request #21 from crosbymichael/events-refactor

Fix events handlers