Refactor query builder
Merge pull request #5 from miquelbarba/refactor_query_builder

Refactor query builder