Fixes #18 and fixes #20
removed unused import
Merge pull request #21 from bleupen/query-strings

Query strings