update quanghuy from master