Fixes for Variar's PR comments
Tabs instead of spaces
Got rid of request marshallers
Stupid PR comment fix :-1:
Merge pull request #8 from prakhar1989/master

Fixes for Variar's PR comments