Fixed merge conflicts
Updated documentation
Updated the proxy.