merged uniform lbp to 1.0 branch