Bootstrap improvmenets
Merge origin/master