Merge pull request #2 from MaxVandervelde/2.1

Bootstrapper updates