Fix query string parsing
Merge pull request #6 from igorw/query-string

Fix query string parsing