Merge pull request #38 from ben-jones/dict-encode

Dict encode and add socks support