Refactoring...
Merge branch 'kemi' of github.com:software-engineering-amsterdam/sea-of-ql into kemi