* pull from master * added query generation by struct fields * ready, improved tests * fixed a naming mistake