Fixes for issue #3 and #4

And OpenCV updated