Merge query helper with Rule
Merge pull request #65 from golyshevd/query

Merge query helper with Rule