Fixes #31; adds query op
Merge pull request #34 from mihaineacsu/31-basic-query

Fixes #31; adds query op