Added support for socks proxies
Merge branch 'pr/171'
Whitespace cleanup and changelog updates