Now supporting context, changes to how query functions
Merge branch 'master' of
https://github.com/georgi-ivanov-tues/Data-Centric-DSL-TUES-Project.git