more changes to cpp client
Merge branch 'master' of https://github.com/abhardwaj/barista