fixing divide-by-zero crash
Merge remote-tracking branch 'origin/master'