Merge pull request #84 from martinh/socks-proxy