Feature/intercept proxy

For review, i would like to include this feature in the next release.