Merge pull request #480 from iamqizhao/master

Fix the benchmark client