Added event handler to the client class
Merge branch 'events'