Working version, but still the last accolade is issueing a None, FIXME
Merge branch 'master' of github.com:software-engineering-amsterdam/poly-ql