Merge pull request #406 from giannello/develop

Added support for http proxy