Fix (un)marshalling logic; enable tests
Merge pull request #201 from yjbanov/proxy-client-fixes

Proxy client fixes