Change efficiency formula, closes #265
Merge branch 'feature/newEfficiencyFormula' into develop