Changed string concantenation to os.path.join