preserve client address
Merge pull request #1 from blint/wip/preserve_client_address

preserve client address