Optimize builder
Merge branch 'master' of https://github.com/software-engineering-amsterdam/ql-obj-alg