to prevent merge conflicts
Merge pull request #41 from kraftery/events

to prevent merge conflicts