diff --git a/LICENSE b/LICENSE
new file mode 100644
--- /dev/null
+++ b/LICENSE
@@ -0,0 +1,20 @@
+Copyright (c) 2014 - 2015 Alexander Thiemann <mail@athiemann.net>
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be included
+in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/README.md b/README.md
new file mode 100644
--- /dev/null
+++ b/README.md
@@ -0,0 +1,34 @@
+blaze-bootstrap
+=====
+
+[![Build Status](https://travis-ci.org/agrafix/blaze-bootstrap.svg)](https://travis-ci.org/agrafix/blaze-bootstrap)
+[![Hackage](https://img.shields.io/hackage/v/blaze-bootstrap.svg)](http://hackage.haskell.org/package/blaze-bootstrap)
+
+## Intro
+
+Hackage: [blaze-bootstrap](http://hackage.haskell.org/package/blaze-bootstrap)
+Stackage: [blaze-bootstrap](https://www.stackage.org/package/blaze-bootstrap)
+
+Blaze helper functions for bootstrap pages
+
+
+## Install
+
+* Using cabal: `cabal install blaze-bootstrap`
+* Using Stack: `stack install blaze-bootstrap`
+* From Source (cabal): `git clone https://github.com/agrafix/blaze-bootstrap.git && cd blaze-bootstrap && cabal install`
+* From Source (stack): `git clone https://github.com/agrafix/blaze-bootstrap.git && cd blaze-bootstrap && stack build`
+
+
+## Misc
+
+### Supported GHC Versions
+
+* 7.6.3
+* 7.8.4
+* 7.10.2
+
+### License
+
+Released under the MIT license.
+(c) 2014 - 2015 Alexander Thiemann
diff --git a/blaze-bootstrap.cabal b/blaze-bootstrap.cabal
--- a/blaze-bootstrap.cabal
+++ b/blaze-bootstrap.cabal
@@ -1,21 +1,29 @@
 name:                blaze-bootstrap
-version:             0.1.0.0
+version:             0.1.0.1
 synopsis:            Blaze helper functions for bootstrap pages
 description:         Simplify building blaze and bootstrap powered pages
 homepage:            http://github.com/agrafix/blaze-bootstrap
 license:             MIT
-author:              Alexander Thiemann <mail@agrafix.net>
-maintainer:          mail@agrafix.net
-copyright:           (c) 2014 Alexander Thiemann
+license-file:        LICENSE
+author:              Alexander Thiemann <mail@athiemann.net>
+maintainer:          Alexander Thiemann <mail@athiemann.net>
+copyright:           (c) 2014 - 2015 Alexander Thiemann
 category:            Web
 build-type:          Simple
 cabal-version:       >=1.10
+tested-with:         GHC==7.6.3, GHC==7.8.4, GHC==7.10.2
+extra-source-files:
+    README.md
 
 library
   exposed-modules:     Text.Blaze.Bootstrap
-  build-depends:       base ==4.*,
-                       blaze-html >=0.7 && <0.8,
-                       text
+  build-depends:       base >=4 && <5,
+                       blaze-html >=0.7,
+                       text >=1.2
   hs-source-dirs:      src
   default-language:    Haskell2010
-  ghc-options: -Wall
+  ghc-options:         -Wall
+
+source-repository head
+  type: git
+  location: https://github.com/agrafix/blaze-bootstrap
diff --git a/src/Text/Blaze/Bootstrap.hs b/src/Text/Blaze/Bootstrap.hs
--- a/src/Text/Blaze/Bootstrap.hs
+++ b/src/Text/Blaze/Bootstrap.hs
@@ -1,8 +1,12 @@
+{-# LANGUAGE CPP #-}
 {-# LANGUAGE OverloadedStrings #-}
 module Text.Blaze.Bootstrap where
 
 import Control.Monad
+#if MIN_VERSION_base(4,8,0)
+#else
 import Data.Monoid
+#endif
 import Text.Blaze.Html5
 import Text.Blaze.Html5.Attributes
 import qualified Data.Text as T