Adapted change log location
Fixed removal of temporary file
Merge branch 'changelog'