Adding a line in the temp path
Merging changes from GitHub