Proxy work
Changes for server with proxy built in
Merge remote-tracking branch 'origin/master'