Added proxy
formatting
Merge branch 'proxy'