Added Event class and changed string and void* argument to Event.
Merge
Merge remote-tracking branch 'origin/master'