Corrected evaluation
Merge branch 'master' of github.com:allyjweir/dissertation-teamt-tp3