Removed dependency to OpenCV. Also, calibration is faster