Added bootstrap
Merge branch 'release/3.0.3'