Bug Fix for events
Merge pull request #67 from domestic/refactoring

Bug Fix for events