Fixing issue #107

getBaseUrl would be a URL, but here we return a client object.