Bugfix/query options

Fixes issue #31