Fixed client and server functions.
Merge remote-tracking branch 'origin'