Added client object
Merge branch 'master' into 1-go-metrics