diff --git a/doc.go b/doc.go
index 686527b3..ea9ac6c5 100644
--- a/doc.go
+++ b/doc.go
@@ -1,109 +1,118 @@
-// Copyright 2012 The Redis Client Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
 /*
 Package github.com/vmihailenco/redis implements a Redis client.
 
-Let's start with connecting to Redis:
+Let's start with connecting to Redis using TCP:
 
-    password := "" // no password set
-    db := -1 // use default DB
+    password := ""  // no password set
+    db := int64(-1) // use default DB
     client := redis.NewTCPClient("localhost:6379", password, db)
     defer client.Close()
 
+    ping := client.Ping()
+    fmt.Println(ping.Err(), ping.Val())
+    // Output: <nil> PONG
+
+or using Unix socket:
+
+    client := redis.NewUnixClient("/tmp/redis.sock", "", -1)
+    defer client.Close()
+
+    ping := client.Ping()
+    fmt.Println(ping.Err(), ping.Val())
+    // Output: <nil> PONG
+
 Then we can start sending commands:
 
-    if err := client.Set("foo", "bar"); err != nil { panic(err) }
+    set := client.Set("foo", "bar")
+    fmt.Println(set.Err(), set.Val())
 
     get := client.Get("foo")
-    if err := get.Err(); err != nil { panic(err) }
-    fmt.Println(get.Val())
+    fmt.Println(get.Err(), get.Val())
+
+    // Output: <nil> OK
+    // <nil> bar
 
 We can also pipeline two commands together:
 
     var set *redis.StatusReq
     var get *redis.StringReq
-    reqs, err := client.Pipelined(func(c *redis.PipelineClient)) {
+    reqs, err := client.Pipelined(func(c *redis.PipelineClient) {
         set = c.Set("key1", "hello1")
         get = c.Get("key2")
-    }
-    if err != nil { panic(err) }
-    if err := set.Err(); err != nil { panic(err) }
-    if err := get.Err(); err != nil { panic(err) }
-    fmt.Println(get.Val())
-    fmt.Println(reqs[0] == set)
-    fmt.Println(reqs[1] == get)
+    })
+    fmt.Println(err, reqs)
+    fmt.Println(set)
+    fmt.Println(get)
+    // Output: <nil> [SET key1 hello1: OK GET key2: (nil)]
+    // SET key1 hello1: OK
+    // GET key2: (nil)
 
 or:
 
-    pipeline, err := client.PipelineClient()
-    if err != nil {
-        panic(err)
-    }
-    defer pipeline.Close()
-
-    set := pipeline.Set("key1", "hello1")
-    get := pipleine.Get("key2")
-
-    reqs, err := pipeline.RunQueued()
-    if err != nil { panic(err) }
-
-    if err := set.Err(); err != nil { panic(err) }
-    if err := get.Err(); err != nil { panic(err) }
-    fmt.Println(get.Val())
-    fmt.Println(reqs[0] == set)
-    fmt.Println(reqs[1] == get)
+    var set *redis.StatusReq
+    var get *redis.StringReq
+    reqs, err := client.Pipelined(func(c *redis.PipelineClient) {
+        set = c.Set("key1", "hello1")
+        get = c.Get("key2")
+    })
+    fmt.Println(err, reqs)
+    fmt.Println(set)
+    fmt.Println(get)
+    // Output: <nil> [SET key1 hello1 GET key2]
+    // SET key1 hello1
+    // GET key2
 
 We can also send several commands in transaction:
 
-    func incrKeyInTransaction(multi *redis.MultiClient) ([]redis.Req, error) {
+    func transaction(multi *redis.MultiClient) ([]redis.Req, error) {
         get := multi.Get("key")
-        if err := get.Err(); err != nil {
-            panic(err)
+        if err := get.Err(); err != nil && err != redis.Nil {
+            return nil, err
         }
 
-        val, err := strconv.ParseInt(get.Val(), 10, 64)
-        if err != nil { panic(err) }
+        val, _ := strconv.ParseInt(get.Val(), 10, 64)
 
-        reqs, err = multi.Exec(func() {
-            multi.Set("key", val + 1)
+        reqs, err := multi.Exec(func() {
+            multi.Set("key", strconv.FormatInt(val+1, 10))
         })
         // Transaction failed. Repeat.
         if err == redis.Nil {
-            return incrKeyInTransaction(multi)
+            return transaction(multi)
         }
         return reqs, err
     }
 
     multi, err := client.MultiClient()
-    if err != nil { panic(err) }
+    _ = err
     defer multi.Close()
 
     watch := multi.Watch("key")
-    if err := watch.Err(); err != nil { panic(err) }
+    _ = watch.Err()
 
-    reqs, err := incrKeyInTransaction(multi)
-    if err != nil { panic(err) }
-    for _, req := range reqs {
-        // ...
-    }
+    reqs, err := transaction(multi)
+    fmt.Println(err, reqs)
+
+    // Output: <nil> [SET key 1: OK]
 
 To subscribe to the channel:
 
     pubsub, err := client.PubSubClient()
-    if err != nil { panic(err) }
     defer pubsub.Close()
 
     ch, err := pubsub.Subscribe("mychannel")
-    if err != nil { panic(err) }
+    _ = err
 
-    go func() {
-        for msg := range ch {
-            if err := msg.Err; err != nil { panic(err) }
-            message := msg.Message
-        }
-    }
+    subscribeMsg := <-ch
+    fmt.Println(subscribeMsg.Err, subscribeMsg.Name)
+
+    pub := client.Publish("mychannel", "hello")
+    _ = pub.Err()
+
+    msg := <-ch
+    fmt.Println(msg.Err, msg.Message)
+
+    // Output: <nil> subscribe
+    // <nil> hello
 
 You can also write custom commands:
 
@@ -113,8 +122,9 @@ You can also write custom commands:
         return req
     }
 
-    get := Get(redisClient, "key")
-    if err := get.Err(); err != nil && err != redis.Nil { panic(err) }
+    get := Get(client, "key_does_not_exist")
+    fmt.Println(get.Err(), get.Val())
+    // Output: (nil)
 
 Client uses connection pool to send commands. You can change maximum number of connections with: