fixed zero goal issue
Merge branch 'zeroGoalFix' into develop