Updated CFR to version 0.31