Server integration v1
Merge pull request #24 from sheniff/server_integration

Server integration v1