Modified setup scripts
Merge commit 'c79eb95a19d8476da53d73d14e50fa8fb5364148' into HEAD