Pointer to the server, and some language changes
Merge pull request #2 from wari/patch-1

Pointer to the server, and some language changes