Updated with bootstrap [github issue #3]