Issue #32: Added some bootstrap features