Changed if statements
Merge branch 'kemi' of https://github.com/software-engineering-amsterdam/sea-of-ql into kemi