updated version of client.py
updated version of client.py
Merge remote-tracking branch 'origin/master'