Proxy feature enhancement described by #88
Merge branch 'proxy-feature' of pull request #93
Release 0.3.9
Mark as a snapshot version