Merge pull request #626 from kitskub/client-connection

Update for API changes
Update for API changes

Signed-off-by: Jack Huey kitskub@gmail.com