new test
better handling
better test
Merge pull request #39 from SalvationDevelopment/client-proxy

Client proxy