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

Client-server updates