More bootstrap.
Merge pull request #1171 from phaidon/more-bootstrap

More bootstrap.