added QueryBuilder
Merge remote-tracking branch 'origin/QueryBuilder' into QueryBuilder