Added argument parameters to query
Merged with master
Merge pull request #1 from moonlimb/master

Added optional query arguments