diff --git a/README.md b/README.md
deleted file mode 100644
index 288db7d..0000000
--- a/README.md
+++ /dev/null
@@ -1,19 +0,0 @@
-![GSI Logo](logo.png)
-[Senpy](http://senpy.herokuapp.com) 
-=========================================
-Example endpoint that yields results compatible with the EUROSENTIMENT format and exposes the NIF API.
-It can be used as a template to adapt existing services to EUROSENTIMENT or to create new services.
-
-[DEMO on Heroku](http://eurosentiment-endpoint.herokuapp.com)
-
-This endpoint serves as bootcampt for any developer wishing to build applications that use the EUROSENTIMENT services.
-
-Acknowledgement
----------------
-EUROSENTIMENT PROJECT
-Grant Agreement no: 296277
-Starting date: 01/09/2012
-Project duration: 24 months
-
-![Eurosentiment Logo](logo_grande.png)
-![FP7 logo](logo_fp7.gif)
diff --git a/README.rst b/README.rst
new file mode 100644
index 0000000..4b1bbfa
--- /dev/null
+++ b/README.rst
@@ -0,0 +1,42 @@
+.. image:: logo.png
+   :height: 6em
+   :align: left
+
+=====================================
+`Senpy <http://senpy.herokuapp.com>`_
+=====================================
+.. image:: https://travis-ci.org/gsi-upm/senpy.svg?branch=master
+    :target: https://travis-ci.org/gsi-upm/senpy
+
+Sentiment analysis web services using a common interface: NIF+JSON-LD.
+
+With Senpy, you can easily turn your sentiment analysis algorithm into a web service, just by creating a new plugin.
+
+
+
+`DEMO on Heroku <http://senpy.herokuapp.com>`_
+
+TO-DO
+-----
+
+* Instalation instructions
+* Improve documentation and generate via Sphinx
+* ReadTheDocs
+* Improve README
+
+
+Acknowledgement
+---------------
+EUROSENTIMENT PROJECT
+Grant Agreement no: 296277
+Starting date: 01/09/2012
+Project duration: 24 months
+
+.. image:: logo_grande.png
+    :target: logo_grande.png
+    :width: 100px
+    :alt: Eurosentiment Logo
+
+.. image:: logo_fp7.gif
+    :width: 100px
+    :target: logo_fp7.gif
diff --git a/app.py b/app.py
index 22eba07..92c596a 100644
--- a/app.py
+++ b/app.py
@@ -19,7 +19,7 @@ This is a helper for development. If you want to run Senpy use:
 
     python -m senpy
 """
-from gevent.monkey import patch_all patch_all()
+from gevent.monkey import patch_all; patch_all()
 import gevent
 import config
 from flask import Flask
diff --git a/logo_fp7.gif b/logo_fp7.gif
new file mode 100644
index 0000000..a8f8c9c
Binary files /dev/null and b/logo_fp7.gif differ
diff --git a/logo_grande.png b/logo_grande.png
new file mode 100644
index 0000000..d1d3031
Binary files /dev/null and b/logo_grande.png differ
diff --git a/setup.cfg b/setup.cfg
index b88034e..5aef279 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,2 +1,2 @@
 [metadata]
-description-file = README.md
+description-file = README.rst