diff --git a/AUTHORS b/AUTHORS
index 5cd98f7..c14ce08 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -12,3 +12,4 @@ Kebert Xela kebertxela
 panyun panyun 
 Whemoon Jang <palindrom615@gmail.com>
 Yury Fedorov orlangure
+o2gy84 <o2gy84@gmail.com>
diff --git a/cmd/bitcaskd/main.go b/cmd/bitcaskd/main.go
index 67b4652..6abaf62 100644
--- a/cmd/bitcaskd/main.go
+++ b/cmd/bitcaskd/main.go
@@ -55,5 +55,7 @@ func main() {
 		os.Exit(2)
 	}
 
-	log.Fatal(server.Run())
+	if err = server.Run(); err != nil {
+		log.Fatal(err)
+	}
 }
diff --git a/cmd/bitcaskd/server.go b/cmd/bitcaskd/server.go
index 5bb74e3..d550650 100644
--- a/cmd/bitcaskd/server.go
+++ b/cmd/bitcaskd/server.go
@@ -2,7 +2,10 @@ package main
 
 import (
 	"fmt"
+	"os"
+	"os/signal"
 	"strings"
+	"syscall"
 
 	log "github.com/sirupsen/logrus"
 	"github.com/tidwall/redcon"
@@ -89,8 +92,13 @@ func (s *server) handleDel(cmd redcon.Command, conn redcon.Conn) {
 	}
 }
 
+func (s *server) Shutdown() (err error) {
+	err = s.db.Close()
+	return
+}
+
 func (s *server) Run() (err error) {
-	err = redcon.ListenAndServe(s.bind,
+	redServer := redcon.NewServerNetwork("tcp", s.bind,
 		func(conn redcon.Conn, cmd redcon.Command) {
 			switch strings.ToLower(string(cmd.Args[0])) {
 			case "ping":
@@ -118,5 +126,17 @@ func (s *server) Run() (err error) {
 		func(conn redcon.Conn, err error) {
 		},
 	)
+
+	go func() {
+		signals := make(chan os.Signal, 1)
+		signal.Notify(signals, os.Interrupt, syscall.SIGTERM)
+		s := <-signals
+		log.Infof("Shutdown server on signal %s", s)
+		redServer.Close()
+	}()
+
+	if err := redServer.ListenAndServe(); err == nil {
+		return s.Shutdown()
+	}
 	return
 }