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

More bootstrap.