Merge pull request #10 from yangqiao/yangqiao

Gros Merge to Master
Merge branch 'yangqiao'
fix query formation
Merge branch 'roccajoseph'