connect server to client
Merge pull request #33 from chiaS/master

connect server to client