Modified setup scripts
Merge commit '80114b95e01ef35d197791ffc906387cbe6de78c' into HEAD