Updated to opencv 2.4