Merge pull request #6 from nubs/master

Force correct handling of query string parameters.