Flatquerybuilder

It would be fantastic if the updated flatquerybuilder could be merged into the develop branch so that it is included in the next release.