diff --git a/bert.cabal b/bert.cabal
--- a/bert.cabal
+++ b/bert.cabal
@@ -1,6 +1,6 @@
 cabal-version: >= 1.16
 name:          bert
-version:       1.2
+version:       1.2.1
 build-type:    Simple
 license:       BSD3
 license-file:  LICENSE
diff --git a/src/Network/BERT.hs b/src/Network/BERT.hs
--- a/src/Network/BERT.hs
+++ b/src/Network/BERT.hs
@@ -3,18 +3,8 @@
   ( module Network.BERT.Transport
   , module Network.BERT.Client
   , module Network.BERT.Server
-  -- * Example
-  -- $example
   ) where
 
 import Network.BERT.Transport
 import Network.BERT.Client
 import Network.BERT.Server
-
--- $example
--- 
--- > t <- fromURI "bert://localhost:8000"
--- > r <- call t "errorcalc" "add" ([123, 300]::[Int])
--- > case r of 
--- >   Right res -> print (res::Int)
--- >   Left e    -> print e
diff --git a/src/Network/BERT/Client.hs b/src/Network/BERT/Client.hs
--- a/src/Network/BERT/Client.hs
+++ b/src/Network/BERT/Client.hs
@@ -1,7 +1,11 @@
 -- | BERT-RPC client (<http://bert-rpc.org/>). This implements the client RPC call logic.
 
 module Network.BERT.Client
-  ( Call, call, tcpClient
+  ( -- * Example
+    -- $example
+    -- * Documentation
+    call, tcpClient,
+    Call, Error(..)
   ) where
 
 import Data.BERT
@@ -41,3 +45,11 @@
 
     recvAndHandle =
       recvt >>= maybe (fail "No answer") handle
+
+-- $example
+--
+-- > t <- tcpClient "localhost" 8080
+-- > r <- call t "calc" "add" ([123, 3000]::[Int])
+-- > case r of
+-- >   Right res -> print (res :: Int)
+-- >   Left _    -> putStrLn "error"
diff --git a/src/Network/BERT/Server.hs b/src/Network/BERT/Server.hs
--- a/src/Network/BERT/Server.hs
+++ b/src/Network/BERT/Server.hs
@@ -3,10 +3,12 @@
 -- supported at this time.
 
 module Network.BERT.Server 
-  ( DispatchResult(..)
-    -- ** Serve
+  (
+    -- * Example
     -- $example
-  , serve
+    -- * Documentation
+    serve
+  , DispatchResult(..)
   , tcpServer
   ) where