Florian Kissling Merge pull request #70 from fk/bootstrap3