Refactoring event states
Merge pull request #205 from ChrisBr/refactoring_event_state

Refactoring event states