Add client options
Bump to version 1.5.4
Merge remote-tracking branch 'origin/set-client-options'