Added the detection for unitless zero option
Added the detection for leading-zero option