diff --git a/docs/AN IMAGE SIGNATURE FOR ANY KIND OF IMAGE.pdf b/docs/AN IMAGE SIGNATURE FOR ANY KIND OF IMAGE.pdf
new file mode 100644
index 0000000..a12b423
Binary files /dev/null and b/docs/AN IMAGE SIGNATURE FOR ANY KIND OF IMAGE.pdf differ
diff --git a/image_match/goldberg.py b/image_match/goldberg.py
index 19674b1..2d3258e 100644
--- a/image_match/goldberg.py
+++ b/image_match/goldberg.py
@@ -96,7 +96,7 @@ def __init__(self, n=9, crop_percentiles=(5, 95), P=None, diagonal_neighbors=Tru
 
         self.handle_mpo = True
 
-    def generate_signature(self, path_or_image, bytestream=False):
+    def generate_signature(self, path_or_image, bytestream=True):
         """Generates an image signature.
 
         See section 3 of Goldberg, et al.
diff --git a/image_match/signature_database_base.py b/image_match/signature_database_base.py
index 86dd2f7..e190b04 100644
--- a/image_match/signature_database_base.py
+++ b/image_match/signature_database_base.py
@@ -270,7 +270,7 @@ def search_image(self, path, all_orientations=False, bytestream=False, pre_filte
             transformed_img = transform(img)
 
             # generate the signature
-            transformed_record = make_record(transformed_img, self.gis, self.k, self.N)
+            transformed_record = make_record(path, self.gis, self.k, self.N)
 
             l = self.search_single_record(transformed_record, pre_filter=pre_filter)
             result.extend(l)
diff --git a/server.py b/server.py
new file mode 100644
index 0000000..5fc3b92
--- /dev/null
+++ b/server.py
@@ -0,0 +1,145 @@
+from elasticsearch import Elasticsearch
+from flask import Flask, request
+from image_match.elasticsearch_driver import SignatureES
+from image_match.goldberg import ImageSignature
+import json
+import os
+
+
+# Globals values
+
+
+es_url = os.environ['http://127.0.0.1:9200/']        # localhost (by default)
+es_index = os.environ['images']                      # index name
+es_doc_type = os.environ['image']                    # doc_type
+all_orientations = os.environ['ALL_ORIENTATIONS']
+
+app = Flask(__name__)
+es = Elasticsearch([es_url], verify_certs=True, timeout=60,
+                   max_retries=10, retry_on_timeout=True)
+ses = SignatureES(es, index=es_index, doc_type=es_doc_type)
+gis = ImageSignature()
+
+# Try to create the index and ignore IndexAlreadyExistsException
+# if the index already exists
+es.indices.create(index=es_index, ignore=400)
+
+# Helper functions
+
+
+def get_image(url_field, file_field):
+    if url_field in request.form:
+        return request.form[url_field], False
+    else:
+        return request.files[file_field].read(), True
+
+
+def count_images():
+    return es.count(index=es_index)['count']
+
+
+def delete_ids(ids):
+    for i in ids:
+        es.delete(index=es_index, doc_type=es_doc_type, id=i, ignore=404)
+
+
+def dist_to_percent(dist):
+    return (1 - dist) * 100
+
+
+def ids_with_path(path):
+    matches = es.search(index=es_index,
+                        _source='_id',
+                        q='path:' + json.dumps(path))
+    return [m['_id'] for m in matches['hits']['hits']]
+
+
+# Routes
+
+@app.route('/search', methods=['GET', 'POST'])
+def search_handler():
+    img, bs = get_image('url', 'image')
+    ao = request.form.get('all_orientations', all_orientations) == 'true'
+
+    matches = ses.search_image(
+        path=img,
+        all_orientations=ao,
+        bytestream=bs)
+
+    return json.dumps({
+        'status': 'ok',
+        'error': [],
+        'method': 'search',
+        'result': [{
+            'score': dist_to_percent(m['dist']),
+            'filepath': m['path'],
+            'metadata': m['metadata']
+        } for m in matches]
+    })
+
+
+@app.route('/delete', methods=['DELETE'])
+def delete_handler():
+    path = request.form['filepath']
+    ids = ids_with_path(path)
+    delete_ids(ids)
+    return json.dumps({
+        'status': 'ok',
+        'error': [],
+        'method': 'delete',
+        'result': []
+    })
+
+
+@app.route('/count', methods=['GET', 'POST'])
+def count_handler():
+    count = count_images()
+    return json.dumps({
+        'status': 'ok',
+        'error': [],
+        'method': 'count',
+        'result': [count]
+    })
+
+# =============================================================================
+# Error Handlers
+
+
+@app.errorhandler(400)
+def bad_request(e):
+    return json.dumps({
+        'status': 'fail',
+        'error': ['bad request'],
+        'method': '',
+        'result': []
+    }), 400
+
+
+@app.errorhandler(404)
+def page_not_found(e):
+    return json.dumps({
+        'status': 'fail',
+        'error': ['not found'],
+        'method': '',
+        'result': []
+    }), 404
+
+
+@app.errorhandler(405)
+def method_not_allowed(e):
+    return json.dumps({
+        'status': 'fail',
+        'error': ['method not allowed'],
+        'method': '',
+        'result': []
+    }), 405
+
+
+@app.errorhandler(500)
+def server_error(e):
+    return json.dumps({
+        'status': 'fail',
+        'error': [str(e)],
+        'method': '',
+        'result': []
+    }), 500