Query generator
Merge pull request #3 from antonpaisov/query_generator

Query generator