Additional fix for issue #442. Input and output files are now correctly
escaped.