Add basic query functionality
Merge pull request #1 from mavnn/develop

Add basic query functionality