diff --git a/LICENSE b/LICENSE
--- a/LICENSE
+++ b/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2012, Mikolaj Konarski
+Copyright (c) 2013, Mikolaj Konarski
 
 All rights reserved.
 
diff --git a/NLP/Miniutter/English.hs b/NLP/Miniutter/English.hs
--- a/NLP/Miniutter/English.hs
+++ b/NLP/Miniutter/English.hs
@@ -3,7 +3,7 @@
 -- | Simple English clause creation parameterized by individual words.
 module NLP.Miniutter.English
   ( Part(..), Person(..), Polarity(..), Irregular
-  , makeSentence, makePhrase, defIrregular, (<>), (<+>), showT
+  , makeSentence, makePhrase, defIrregular, (<>), (<+>)
   ) where
 
 import Data.Binary
@@ -16,7 +16,8 @@
 import Data.Text.Encoding (decodeUtf8, encodeUtf8)
 import GHC.Generics (Generic)
 import NLP.Minimorph.English
-import NLP.Minimorph.Util
+import NLP.Minimorph.Util hiding (showT, (<>))
+import Data.Monoid ((<>))
 
 -- | Various basic and compound parts of English simple present tense clauses.
 -- Many of the possible nestings do not make sense. We don't care.
@@ -50,7 +51,7 @@
   readsPrec p str = [(Text x, y) | (x, y) <- readsPrec p str]
 
 instance IsString Part where
-    fromString = Text . T.pack
+  fromString = Text . T.pack
 
 -- | Persons: singular 1st, singular 3rd and the rest.
 data Person = Sg1st | Sg3rd | PlEtc
@@ -96,7 +97,7 @@
   Cardinal n -> cardinal n
   Ws p -> onLastWord (makePlural irr) (mkPart p)
   CarWs 1 p -> mkPart (AW p)
-  CarWs n p -> showT n <+> onLastWord (makePlural irr) (mkPart p)
+  CarWs n p -> T.pack (show n) <+> onLastWord (makePlural irr) (mkPart p)
   CardinalWs 1 p -> mkPart (AW p)
   CardinalWs n p -> cardinal n <+> onLastWord (makePlural irr) (mkPart p)
   Ordinal n -> ordinal n
diff --git a/README.md b/README.md
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-miniutter [![Build Status](https://secure.travis-ci.org/Mikolaj/miniutter.png)](http://travis-ci.org/Mikolaj/miniutter)
+miniutter [![Build Status](https://secure.travis-ci.org/Mikolaj/miniutter.png)](http://travis-ci.org/Mikolaj/miniutter)[![Build Status](https://drone.io/github.com/Mikolaj/miniutter/status.png)](https://drone.io/github.com/Mikolaj/miniutter/latest)
 =========
 
 
diff --git a/miniutter.cabal b/miniutter.cabal
--- a/miniutter.cabal
+++ b/miniutter.cabal
@@ -1,6 +1,12 @@
 name:          miniutter
-version:       0.4.2
-synopsis:      Simple English clause creation from arbitrary words.
+-- The package version. See the Haskell package versioning policy (PVP)
+-- for standards guiding when and how versions should be incremented.
+-- http://www.haskell.org/haskellwiki/Package_versioning_policy
+-- PVP summary: +-+------- breaking API changes
+--              | | +----- non-breaking API additions
+--              | | | +--- code changes with no API change
+version:        0.4.3.0
+synopsis:      Simple English clause creation from arbitrary words
 description:   This library helps in generating simple present tense
                English sentences from short, parametrized descriptions.
                In a typical use, the structure of a clause is fixed,
@@ -14,8 +20,8 @@
 bug-reports:   https://github.com/Mikolaj/miniutter/issues
 license:       BSD3
 license-file:  LICENSE
-tested-with:   GHC == 7.4.2, GHC == 7.6.1
-data-files:    LICENSE, README.md
+tested-with:   GHC == 7.4.2, GHC == 7.6.3, GHC == 7.8
+extra-source-files: LICENSE, README.md
 author:        Mikolaj Konarski
 maintainer:    Mikolaj Konarski <mikolaj.konarski@funktory.com>
 category:      Natural Language Processing
@@ -32,7 +38,7 @@
   build-depends:      base                 >= 4        && < 5,
                       binary               >= 0.6.3.0  && < 1,
                       ghc-prim             >= 0.2,
-                      text                 >= 0.11.2.3 && < 1,
+                      text                 >= 0.11.2.3 && < 2,
                       containers           >= 0.4.1    && < 1,
                       minimorph            >= 0.1.4    && < 1
 
@@ -51,7 +57,7 @@
   hs-source-dirs:     test
   build-depends:      miniutter,
                       base                 >= 4        && < 5,
-                      text                 >= 0.11.2.3 && < 1,
+                      text                 >= 0.11.2.3 && < 2,
                       containers           >= 0.4.1    && < 1,
                       test-framework       >= 0.6      && < 1,
                       test-framework-hunit >= 0.2      && < 1,