WIP
Merge pull request #1 from vladikoff/proxy

WIP