Expose query options
Merge pull request #1 from confuser/master

Expose query options