diff --git a/CHANGES.rst b/CHANGES.rst
index c94559e..1d9f9b1 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -14,6 +14,7 @@ Changelog
   - Any request for a non-normalized package name is redirected to
     the normalized name.
 
+- #114: Added `pip search` support (thanks to @blade2005)
 - #117, #122, #124/#127/#128: FIX startup regressions introduced by
   previous `v1.1.10` (thanks to @virtuald, @Oneplus, @michaelkuty, @harcher81,
   @8u1a).
@@ -108,7 +109,7 @@ Serve 1000s of packages, PGP-Sigs, skip versions starting with 'v'.
 
 
 1.1.7 (2015-03-8)
-------------------
+-----------------
 1st release under cooperative ownership:
 
 - #65, #66: Improve Auth for private repos by supporting i
diff --git a/pypiserver/__init__.py b/pypiserver/__init__.py
index 853aebb..0dcc106 100644
--- a/pypiserver/__init__.py
+++ b/pypiserver/__init__.py
@@ -31,25 +31,26 @@ class Configuration(object):
 
 DEFAULT_SERVER = "auto"
 
+
 def default_config(
         root=None,
-        host = "0.0.0.0",
-        port = 8080,
-        server = DEFAULT_SERVER,
-        redirect_to_fallback = True,
-        fallback_url = None,
-        authenticated = ['update'],
-        password_file = None,
-        overwrite = False,
-        hash_algo = 'md5',
-        verbosity = 1,
-        log_file = None,
-        log_frmt = "%(asctime)s|%(name)s|%(levelname)s|%(thread)d|%(message)s",
-        log_req_frmt = "%(bottle.request)s",
-        log_res_frmt = "%(status)s",
-        log_err_frmt = "%(body)s: %(exception)s \n%(traceback)s",
-        welcome_file = None,
-        cache_control = None,
+        host="0.0.0.0",
+        port=8080,
+        server=DEFAULT_SERVER,
+        redirect_to_fallback=True,
+        fallback_url=None,
+        authenticated=['update'],
+        password_file=None,
+        overwrite=False,
+        hash_algo='md5',
+        verbosity=1,
+        log_file=None,
+        log_frmt="%(asctime)s|%(name)s|%(levelname)s|%(thread)d|%(message)s",
+        log_req_frmt="%(bottle.request)s",
+        log_res_frmt="%(status)s",
+        log_err_frmt="%(body)s: %(exception)s \n%(traceback)s",
+        welcome_file=None,
+        cache_control=None,
         auther=None,
         VERSION=__version__):
     """
@@ -114,9 +115,9 @@ def default_config(
 
 def app(**kwds):
     """
-    :param dict kwds:
-            Any overrides for defaults, as fetched by :func:`default_config()`.
-            Check the docstring of this function for supported kwds.
+    :param dict kwds: Any overrides for defaults, as fetched by
+        :func:`default_config()`. Check the docstring of this function
+        for supported kwds.
     """
     from . import core, _app
 
@@ -128,11 +129,13 @@ def app(**kwds):
 
     return _app.app
 
+
 def str2bool(s, default):
     if s is not None and s != '':
         return s.lower() not in ("no", "off", "0", "false")
     return default
 
+
 def paste_app_factory(global_config, **local_conf):
     import os
 
@@ -156,6 +159,7 @@ def paste_app_factory(global_config, **local_conf):
 
     return app(**c)
 
+
 def _logwrite(logger, level, msg):
     if msg:
         line_endings = ['\r\n', '\n\r', '\n']