diff --git a/CHANGELOG.md b/CHANGELOG.md
new file mode 100644
--- /dev/null
+++ b/CHANGELOG.md
@@ -0,0 +1,7 @@
+# 0.1.1
+
+- Tested with GHC 8.0.1.
+
+- Tested with Servant 0.8.
+
+# 0.1.0
diff --git a/mailchimp.cabal b/mailchimp.cabal
--- a/mailchimp.cabal
+++ b/mailchimp.cabal
@@ -1,5 +1,5 @@
 name: mailchimp
-version: 0.1.0
+version: 0.1.1
 
 build-type: Simple
 cabal-version: >= 1.21
@@ -21,9 +21,11 @@
 
 category: Web
 
-tested-with: GHC == 7.10.3
+tested-with: GHC == 7.10.3, GHC == 8.0.1
 
-extra-source-files: README.md
+extra-source-files:
+  CHANGELOG.md
+  README.md
 
 
 library
@@ -46,8 +48,8 @@
     , bytestring
     , http-client >= 0.4 && < 0.5
     , http-client-tls >= 0.2 && < 0.3
-    , servant >= 0.7 && < 0.8
-    , servant-client >= 0.7 && < 0.8
+    , servant >= 0.7 && < 0.9
+    , servant-client >= 0.7 && < 0.9
     , text >= 1.2 && < 1.3
     , transformers
   default-language:
diff --git a/src/Web/MailChimp/Tutorial.hs b/src/Web/MailChimp/Tutorial.hs
--- a/src/Web/MailChimp/Tutorial.hs
+++ b/src/Web/MailChimp/Tutorial.hs
@@ -1,3 +1,6 @@
+{-# LANGUAGE OverloadedStrings #-}
+{-# LANGUAGE RecordWildCards #-}
+
 ----------------------------------------------------------------------
 -- |
 -- Module: Web.MailChimp.Tutorial
@@ -8,49 +11,57 @@
 ----------------------------------------------------------------------
 
 module Web.MailChimp.Tutorial
-  (
+  ( example
   )
   where
 
--- |
---
--- {-# LANGUAGE OverloadedStrings #-}
--- {-# LANGUAGE RecordWildCards #-}
--- 
--- -- base
--- import System.Environment (getEnv)
---
--- -- bytestring
--- import Data.ByteString.Char8 (pack)
---
--- -- mailchimp
--- import Web.MailChimp
---
--- -- text
--- import qualified Data.Text as Text
---
---
--- example :: IO ()
--- example = do
---   manager <- makeManager
---   key <- fmap pack (getEnv "MAILCHIMP_API_KEY")
---   listId <- fmap Text.pack (getEnv "MAILCHIMP_LIST_ID")
---
---   let
---     Just ListMemberClient {..} =
---       makeListMemberClient manager key listId
---
---   let
---     member =
---       (makeListMemberRequest "sd@sd.com" Pending)
---         { listMemberMergeFields = [("FNAME", "Juan")]
---         }
---
---   eitherAdd <- addListMember member
---
---   case eitherAdd of
---     Left err ->
---       putStrLn $ "Error: " ++ show err
---
---     Right msg ->
---       print msg
+-- base
+import System.Environment (getEnv)
+
+-- bytestring
+import Data.ByteString.Char8 (pack)
+
+-- mailchimp
+import Web.MailChimp
+
+-- text
+import qualified Data.Text as Text
+
+
+example :: IO ()
+example = do
+  manager <- makeManager
+  key <- fmap pack (getEnv "MAILCHIMP_API_KEY")
+  listId <- fmap Text.pack (getEnv "MAILCHIMP_LIST_ID")
+
+  let
+    Just Client {..} =
+      makeClient manager key
+
+  let
+    Just ListMemberClient {..} =
+      makeListMemberClient manager key listId
+
+  let
+    member =
+      (makeListMemberRequest "sd@sd.com" Pending)
+        { listMemberMergeFields = [("FNAME", "Juan")]
+        }
+
+  eitherLinks <- getLinks
+
+  case eitherLinks of
+    Left err ->
+      putStrLn $ "Error: " ++ show err
+
+    Right msg ->
+      print msg
+
+  eitherAdd <- addListMember member
+
+  case eitherAdd of
+    Left err ->
+      putStrLn $ "Error: " ++ show err
+
+    Right msg ->
+      print msg