encapsulate query arguments, closes #368
Merge pull request #488 from modilabs/queryargs-368

encapsulate query arguments, closes #368