Finished the events
Merge pull request #45 from kraftery/events

Finished the events