making simple-proxy nicer
Merge branch 'master' into optimize