Feature/update bootstrap

closes #559