Refactor client request.
Merge pull request #8 from hemslo/develop

Refactor client request.