Proxy configuration
Merge pull request #132 from sorenh/proxy

Proxy configuration