Basic changes
Merge branch 'master' into feature/extended-event-information
Merge pull request #174 from ZeusWPI/feature/extended-event-information

Feature/extended event information