query parser initial commit
Merge branch 'feature/query_parser'