Merge pull request #767 from KyleAure/currentEvent-and-fromJsonStructure-fix

Last event method removed