Client-server updates
Merge pull request #2 from jakezu/client-server

Client-server updates
Merge pull request #1 from jakezu/client-server

Client-server updates
Merge branch 'master' of https://github.com/syymza/Oulutest
Merge pull request #2 from syymza/master

Merge with client-server for the master