Refactoring some code for more readability.
Merge pull request #6 from viig99/proxying

Refactoring some code for more readability.
Merge pull request #27 from prakhar1989/proxying

Edited tests