Add files for query execution
Merge branch 'master' into Issue2