FIX: Mac OS X compatibility *sigh*
Merge pull request #178 from reneme/refurbish_bootstrap

FIX: Mac OS X compatibility *sigh*