Improved bootstrap code
Merge pull request #1 from tassoevan/development

Improved bootstrap code