Use path.join instead of plain string concatenation to construct file paths.
Merge branch 'fix-pathnames-handling' into develop