Create Bootstrap logic
Merge origin/master