First commit for project. Until here, many clients can establish a connection to the server.
Merge origin/master