add proxy setting
Merge branch 'sanritz'