diff --git a/.travis.yml b/.travis.yml
index 4956e10..9361118 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -68,7 +68,11 @@ jobs:
         - doxygen Doxyfile
         - make html
         - cd ..
-        - doctr deploy . --built-docs docs/_build/html
+        - if [ -n "$TRAVIS_TAG" ]; then
+             doctr deploy . --built-docs docs/_build/html --no-require-master || travis_terminate 1;
+          else
+             doctr deploy . --built-docs docs/_build/html --no-require-master --no-push || travis_terminate 1;
+          fi
 
     - stage: pypi_deploy
       env:
@@ -82,4 +86,8 @@ jobs:
         - ls
         - python setup.py sdist
 #        - if [ -n "$TRAVIS_TAG" ]; then twine upload --repository-url "https://test.pypi.org/legacy/" dist/*; else echo "package _not_ uploaded to testpypi"; fi
-        - if [ -n "$TRAVIS_TAG" ]; then twine upload dist/*; else echo "package _not_ uploaded to pypi"; fi
\ No newline at end of file
+        - if [ -n "$TRAVIS_TAG" ]; then
+             twine upload dist/* || travis_terminate 1;
+          else
+             echo "package _not_ uploaded to pypi";
+          fi
\ No newline at end of file
diff --git a/README.rst b/README.rst
index bf1f243..a6841f3 100644
--- a/README.rst
+++ b/README.rst
@@ -48,7 +48,7 @@ For the following steps make sure that your ``CC`` and ``CXX`` variables are set
 Installation
 ============
 
-.. code-block: bash
+.. code-block:: bash
 
    pip install catana
 
diff --git a/setup.py b/setup.py
index 39c598a..976f027 100644
--- a/setup.py
+++ b/setup.py
@@ -60,10 +60,14 @@ def get_cmdclass():
     cmdclass.update({"build_ext": CMakeBuild})
     return cmdclass
 
+def readme():
+    with open('README.rst') as f:
+        return f.read()
 
 setup(
     name='catana',
     description='A library for Spherical Fourier Bessel (SFB) Decomposition',
+    long_description=readme(),
     license='GPLv2',
     author='Michael Buehlmann',
     author_email='michael.buehlmann@oca.eu',