Added more code to complete the connection to the server.
Merge branch 'master' of https://github.com/Hervature/rubarb
Fixed Zach's typos.