Run.sh with relative paths
Merge remote-tracking branch 'origin/master'

Conflicts:
	run.sh