Fix query parameters
Merge pull request #26 from alecsammon/fix_query_parameters

Fix query parameters 
closes #21