Merge Wahchun's pull Request on Events.