Made compatible with latest version of bootstrap

Re-delivering #124 after accidentally merging it into the master branch.