Add events to Server
Wait for server response
Merge pull request #84 from dlabz/Bryan

Bryan, catch a patch