Correcting order or parameters that get passed to GenericEvent.
Merge pull request #1469 from shefik/Event

Correcting order of parameters that get passed to GenericEvent.