Merge pull request #30 from limianwang/master

changed: developers have now flexibility in determining queries