Query compliance
Merge pull request #98 from se1-1314/nilsbranch

Query compliance