Tests fixed. QueryBuidler implementation completed.
Merge branch 'master' of https://github.com/s2way/nrcm