Fix calculating unit when zero size passed.
Merge remote-tracking branch 'origin/master'