Use relative paths after "cd" command
Merge branch 'master' into weighting