Fixes #1854: Add proxy option