Bootstrap
Merge pull request #3 from GLundh/master

merge