changes in bxiong branch

Pull merge request