Small improvements to query builder
Merge pull request #48 from kaisellgren/patch-2

Small improvements to query builder