Bootstrap setup
Merge pull request #1 from grena/bootstrap

Bootstrap setup