Client.py and error no 35 fix#2

Merged

mwalsh161 merged 4 commits intomwalsh161:masterfrom

cpeng365:master

Jan 14, 2020

Commits on Jan 12, 2020

Commits on Jan 13, 2020

Fix minor bugs
cpeng365
committed

Commits on Jan 14, 2020

Fix minor bugs
cpeng365
committed