Added bootstrap function
Merge resolution