fix dividing by 0 issue
Merge remote-tracking branch 'origin/Alpha' into Alpha