Fix client communication.
Merge branch 'server_test' of github.com:nmcalabroso/Push into server_test