add some client implementation
Solve bugs in master
Merge branch 'master' into lhh_dev

Merge from master to use new error definition
Change error definition