Add more client options
Merge branch 'master' of github.com:IPnett/cloud-BaaS