Added option "quant"
Fix pull master conflict