Merge pull request #86 from TheBlueMatt/2018-07-event-fixes