Bug fixes.
Changes
Merge remote-tracking branch 'origin/master'
Fixing OpenCV compatibility
caca comment