Merge pull request #1 from muestefa/master

merge test setup changes
add proxy feature
Merge pull request #2 from guhilling/proxy-feature

add proxy feature
Merge pull request #1 from guhilling/master

update to head