[Query Processing] add a complex query
[Query Processing] Try to combine everything
Merge pull request #16 from 1169306/master

pull