Updated to bootstrap independent branch. Closes #1