refurbish bootstrap.sh
Merge pull request #174 from reneme/refurbish_bootstrap

FIX: Refurbished bootstrap.sh