diff --git a/cmd/inquirer/inquirer.go b/cmd/inquirer/inquirer.go
index 2449a48f2..09e24acf4 100644
--- a/cmd/inquirer/inquirer.go
+++ b/cmd/inquirer/inquirer.go
@@ -42,6 +42,8 @@ func main() {
 	rpc.Register(raterServer)
 	rpc.HandleHTTP()
 	
+	go StopSingnalHandler()
+
 	responder := new(Responder)
 	srvr := rpc.NewServer()
 	srvr.Register(responder)
diff --git a/cmd/rater/rater.go b/cmd/rater/rater.go
index fac6c5fc9..84e6bcac8 100644
--- a/cmd/rater/rater.go
+++ b/cmd/rater/rater.go
@@ -27,6 +27,13 @@ func (s *Storage) Get(args string, reply *string) (err error) {
 	return err
 }
 
+func (s *Storage) Shutdown(args string, reply *string) (err error) {
+	s.sg.Close()
+	defer os.Exit(0)
+	*reply = "Done!"
+	return nil
+}
+
 func main() {	
 	flag.Parse()
 	getter, err := NewKyotoStorage("storage.kch")