Beta version of up-to-date query builder constructor
syntax error fix
spaces to tabs
Merge pull request #1476 from Cinderella-Man/2.0.0-query-builder-update

[2.0.0] Query builder's constructor update