Fixed bootstrap integration
merged karthiksenthil-master
Merge branch 'karthiksenthil-master'