Tweak.
Merge branch 'dev_setup'

Conflicts:
	setup.sh