Fixes #35; Adds query class
Merge pull request #36 from mihaineacsu/35-query-class

Fixes #35; Adds query class