Merge branch 'focus/queries' of https://github.com/DaMSL/K3-Core into focus/queries