Query stuff

Query stuff
Merge pull request #2 from CallumX/patch-4

Query stuff