OCR, setting simplification
Merge better error management
kk
Merge branch 'master' into ocr

Merge master
add latest sources
ocr
tested version
tested version