Added http proxy support.
Fixed typo.
Passing http opts in the correct way.
Merge branch 'test' into dev