Merge pull request #8 from corest/query_support

Add support for simple queries