diff --git a/pyreadline/modes/emacs.py b/pyreadline/modes/emacs.py
index dcf35ba..d76680f 100644
--- a/pyreadline/modes/emacs.py
+++ b/pyreadline/modes/emacs.py
@@ -600,6 +600,7 @@ class EmacsMode(DigitArgumentMode, IncrementalSearchPromptMode, SearchPromptMode
         self._bind_key(u'Control-b',         self.backward_char)
         self._bind_key(u'Right',             self.forward_char)
         self._bind_key(u'Control-f',         self.forward_char)
+        self._bind_key(u'Control-h',         self.backward_delete_char)
         self._bind_key(u'BackSpace',         self.backward_delete_char)
         self._bind_key(u'Control-BackSpace', self.backward_delete_word)
         
diff --git a/setup.py b/setup.py
index 151c3be..79a698b 100644
--- a/setup.py
+++ b/setup.py
@@ -24,7 +24,7 @@ try:
     from sphinx.setup_command import BuildDoc
     cmd_class ={'build_sphinx': BuildDoc}
 except ImportError:
-    cmd_class = None
+    cmd_class = {}
 
 packages = ['pyreadline','pyreadline.clipboard','pyreadline.configuration',
             'pyreadline.console','pyreadline.keysyms','pyreadline.lineeditor',