Fixed minor error in code
Merge branch 'jon' into sprint6