Updated to newer OpenCV