add support for a generic query
Merge pull request #9 from mbroadst/generic-query-support

add support for a generic query