Issue#383 bootstrap

Fixes #383