Support query option
Merge pull request #14 from hakobera/support-query-option

Support query option