Adds support for more advanced queries (WIP, not tested).
Merge branch 'master' of github.com:unparse/node-unparse