More bootstrap
Merge pull request #1164 from phaidon/more-bootstrap

More bootstrap