ClientProtocol error fixing
ClientProtocol error fixing
Merge branch 'kevin'