Feature/bootstrap

Fixes #3