code review
Merge branch 'zeroGoalFix' into develop