missed one commit
Merge pull request #9 from h2r/client_bug_fixes

missed one commit