Updated master branch for web server proxy