integrate proxy support from dev to master, closes #241