Allow a "query" to be passed in.
Merge pull request #3 from pcn/accept-query-option

Allow a "query" to be passed in.