EventType and location added to event
Merge pull request #17 from LeafCoders/EventTypeAndLocation

EventType and location added to event