Refactored request/response.
Merge pull request #169 from SammyK/simple-request-response-refactor

[4.1] Simple request response refactor