fixing minor issue with setup script
Merge branch 'master' into cars