Finished the functionality
Merge branch 'master' of https://github.com/software-engineering-amsterdam/poly-ql.git