client example passed.
Merge branch 'master' into jianw_dev