Fix cd.sh logic
Merge remote-tracking branch 'franco/franco' into franco