More bootstrap
Merge pull request #1199 from phaidon/bootstrap

More bootstrap