Add location to events
Merge pull request #89 from gavD/master

Add location to events