Windows fixes
OCR not processing files with spaces
OCR not processing files with spaces
OCR not processing files with spaces
OCR not processing files with spaces
OCR not processing files with spaces
OCR not processing files with spaces
OCR not processing files with spaces
Merge branch 'mark' into dev