Fixes #1852: Add proxy option