Bugfix to handle query strings correctly
Merge pull request #1 from jfouse/develop

Bugfix to handle query strings correctly