fixing bug in setup script
merge with remote