CR change: changed ''.join to os.path.join