Added proxies, fixes #5