diff --git a/GenericPretty.cabal b/GenericPretty.cabal
--- a/GenericPretty.cabal
+++ b/GenericPretty.cabal
@@ -7,7 +7,7 @@
 -- The package version. See the Haskell package versioning policy
 -- (http://www.haskell.org/haskellwiki/Package_versioning_policy) for
 -- standards guiding when and how versions should be incremented.
-Version:             1.2.1
+Version:             1.2.2
 
 -- A short (one-line) description of the package.
 Synopsis:            A generic, derivable, haskell pretty printer.
@@ -18,7 +18,7 @@
   derivation of pretty printing functions on user defined data
   types.
   .
-  The form of generics used is based on that introduced in the paper:
+  The form of geenrics used is based on that introduced in the paper:
   Magalhaes, Dijkstra, Jeuring, and Loh,
   A Generic Deriving Mechanism for Haskell,
   3'rd ACM Symposium on Haskell, pp. 37-48, September 2010,
@@ -29,7 +29,7 @@
   .
   This package requires the use of the new GHC.Generics features
   <http://www.haskell.org/haskellwiki/GHC.Generics>, present from GHC 7.2.
-  Use of these features is indicated by the DeriveGeneric pragma
+  Use of these features is indicated by the DeriveGeneric pragma.
   or the flag -XDeriveGeneric.
   .
   Pretty printing produces values of type Text.PrettyPrint.Doc, using
@@ -75,7 +75,7 @@
 
 -- Extra files to be distributed with the package, such as examples or
 -- a README.
-Extra-source-files: README TestSuite/SimpleTest.hs TestSuite/Tests.hs TestSuite/CustomTest.hs TestSuite/ZigZagTest.hs
+Extra-source-files: README TestSuite\SimpleTest.hs TestSuite\Tests.hs TestSuite\CustomTest.hs TestSuite\ZigZagTest.hs
 
 -- Constraint on the version of Cabal needed to build this package.
 Cabal-version:       >=1.6
diff --git a/README b/README
--- a/README
+++ b/README
@@ -54,9 +54,9 @@
 Otherwise, the steps are:
   0. Make sure you have a version of ghc >= 7.4 installed and that you can 
      use the 'runhaskell' command from the command line.
-  1. Download and unpack "GenericPretty-1.2.0.tar.gz"
+  1. Download and unpack "GenericPretty-1.2.2.tar.gz"
   2. Move to the correct directory:
-      $ cd GenericPretty-1.2.0
+      $ cd GenericPretty-1.2.2
   3. Run the following haskell commands to install the library globally:
       $ runhaskell Setup configure 
       $ runhaskell Setup build
diff --git a/TestSuite/SimpleTest b/TestSuite/SimpleTest
new file mode 100644
Binary files /dev/null and b/TestSuite/SimpleTest differ
diff --git a/TestSuite/SimpleTest.hi b/TestSuite/SimpleTest.hi
new file mode 100644
Binary files /dev/null and b/TestSuite/SimpleTest.hi differ
diff --git a/TestSuite/SimpleTest.o b/TestSuite/SimpleTest.o
new file mode 100644
Binary files /dev/null and b/TestSuite/SimpleTest.o differ
diff --git a/Text/PrettyPrint/GenericPretty.hs b/Text/PrettyPrint/GenericPretty.hs
--- a/Text/PrettyPrint/GenericPretty.hs
+++ b/Text/PrettyPrint/GenericPretty.hs
@@ -1,4 +1,5 @@
 {-# LANGUAGE TypeOperators, FlexibleInstances, FlexibleContexts, DefaultSignatures #-}
+{-# LANGUAGE CPP #-}
 
 {-|
   GenericPretty is a Haskell library that supports automatic
@@ -23,6 +24,11 @@
                       outputIO, outputStr,
                       ) where
 
+
+#if MIN_VERSION_base(4,11,0)
+-- Avoid name clash with Prelude.<> exported by post-SMP versions of base.
+import Prelude hiding ( (<>) )
+#endif
 import Data.List
 import GHC.Generics
 import Data.Char
@@ -292,7 +298,6 @@
 -- | Customizable pretty printer 
 --
 -- Takes a user defined 'Text.PrettyPrint.MyPretty.Style' as a parameter and uses 'outputStr' to obtain the result
---
 -- Equivalent to:
 --
 -- > fullPP outputStr ""
@@ -324,7 +329,6 @@
 -- | Customizable pretty printer.
 -- 
 -- Takes a user defined 'Text.PrettyPrint.MyPretty.Style' as a parameter and uses 'outputIO' to obtain the result
---
 -- Equivalent to:
 --
 -- > fullPP outputIO (putChar '\n')