Client-server updates
Merge branch 'client-server' of https://github.com/jakezu/Oulutest into jakezu-client-server