Update for boot 2.0.0-rc1
Merge pull request #1 from micha/master

Update for boot 2.0.0-rc1