diff --git a/README.md b/README.md
--- a/README.md
+++ b/README.md
@@ -130,23 +130,23 @@
    -- unsetEnvironment (toEnv :: EnvList ConnectInfo)  -- remove when done
 ```
 
-Our parser might also make use a set of an optional default values provided by the user, 
+Our parser might also make use a set of an optional default values provided by the user,
 for dealing with errors when reading from the environment
 
 ```haskell
 instance FromEnv ConnectInfo where
-  fromEnv Nothing = 
+  fromEnv Nothing =
     ConnectInfo <$> envMaybe "PG_HOST" .!= "localhost"
 		<*> env "PG_PORT"
 		<*> env "PG_USER"
 		<*> env "PG_PASS"
 		<*> env "PG_DB"
-        
-  fromEnv (Just def) = 
+
+  fromEnv (Just def) =
     ConnectInfo <$> envMaybe "PG_HOST" .!= (pgHost def)
 		<*> envMaybe "PG_PORT" .!= (pgPort def)
 		<*> env "PG_USER" .!= (pgUser def)
-		<*> env "PG_PASS" .!= (pgPass def) 
+		<*> env "PG_PASS" .!= (pgPass def)
 		<*> env "PG_DB" .!= (pgDB def)
 ```
 
@@ -240,8 +240,8 @@
 import GHC.Generics
 
 data PGConfig = PGConfig {
-    connectHost :: String -- "PG_HOST"
-  , connectPort :: Int    -- "PG_PORT"
+    pgHost :: String -- "PG_HOST"
+  , pgPort :: Int    -- "PG_PORT"
   } deriving (Generic, Show)
 
 -- All fields will be converted to uppercase
diff --git a/envy.cabal b/envy.cabal
--- a/envy.cabal
+++ b/envy.cabal
@@ -1,5 +1,5 @@
 name:                envy
-version:             2.1.0.0
+version:             2.1.1.0
 synopsis:            An environmentally friendly way to deal with environment variables
 license:             BSD3
 license-file:        LICENSE
@@ -20,11 +20,11 @@
   exposed-modules:      System.Envy
   ghc-options:          -Wall
   hs-source-dirs:       src
-  build-depends:        base         >= 4.7 && < 5
-                      , bytestring   == 0.10.*
+  build-depends:        base         >= 4.11 && < 5
+                      , bytestring   == 0.10.* || == 0.11.*
                       , containers   >= 0.5 && < 0.7
                       , mtl          == 2.2.*
-                      , text         == 1.2.*
+                      , text         == 1.2.* || == 2.0.*
                       , time         >= 1.5 && < 2.0
                       , transformers >= 0.4 && < 0.6
   default-language:     Haskell2010
diff --git a/src/System/Envy.hs b/src/System/Envy.hs
--- a/src/System/Envy.hs
+++ b/src/System/Envy.hs
@@ -49,6 +49,7 @@
 module System.Envy
        ( -- * Classes
          FromEnv (..)
+       , GFromEnv (..)
        , ToEnv   (..)
        , Var     (..)
        , EnvList (..)