Updates to Event class
Merge pull request #12 from balor123/master

Updates to Event class