   (when (buffer-live-p (emacspeak-maths-server-buffer emacspeak-maths))
     (kill-buffer (emacspeak-maths-server-buffer emacspeak-maths)))
   (when (buffer-live-p (emacspeak-maths-client-buffer emacspeak-maths))
-    (kill-buffer (emacspeak-maths-client-buffer emacspeak-maths))))
+    (kill-buffer (emacspeak-maths-client-buffer emacspeak-maths)))
+  (when (called-interactively-p 'interactive)
+    (message "Shutdown Maths server and client.")))
 
 (defun emacspeak-maths-ensure-server ()
   "Start up Maths Server bridge if not already running."

     "Spoken Math"
     ("SPC" emacspeak-maths-enter "enter")
     ("a" emacspeak-maths-speak-alt "Alt Text")
     ("r" emacspeak-maths-root "Root")
     ("<up>" emacspeak-maths-up "Up")
     ("<down>" emacspeak-maths-down"down")

                    (file-name-directory (or load-file-name default-directory)))
  "NodeJS implementation of math-server.")
;;;###autoload

(defun emacspeak-maths-start ()
  "Start Maths server bridge."
  (interactive)
  (declare (special emacspeak-maths-inferior-program
                    emacspeak-maths emacspeak-maths-server-program))
  (let ((server
