diff --git a/README.md b/README.md
index 8666ae1abbc..31af29ba9f2 100644
--- a/README.md
+++ b/README.md
@@ -1,11 +1,10 @@
 Overpass API python wrapper
 ===========================
 
-This is a thin wrapper around the OpenStreetMap `Overpass
-API <http://wiki.openstreetmap.org/wiki/Overpass_API>`__.
-
-![travis-build-badge](https://travis-ci.org/mvexel/overpass-api-python-wrapper.svg?branch=master)
+This is a thin wrapper around the OpenStreetMap [Overpass
+API](http://wiki.openstreetmap.org/wiki/Overpass_API>).
 
+[![Build Status](https://travis-ci.org/mvexel/overpass-api-python-wrapper.svg?branch=master)](https://travis-ci.org/mvexel/overpass-api-python-wrapper)
 
 Install it
 ==========
diff --git a/setup.py b/setup.py
index 00b68b545c9..ebf0d6ceb06 100644
--- a/setup.py
+++ b/setup.py
@@ -1,14 +1,17 @@
 from codecs import open as codecs_open
 from setuptools import setup, find_packages
 
-# Get the long description from the relevant file
-with codecs_open('README.md', encoding='utf-8') as f:
-    long_description = f.read()
+# Get README in rst
+try:
+    import pypandoc
+    long_description = pypandoc.convert('README.md', 'rst')
+except(IOError, ImportError):
+    long_description = open('README.md').read()
 
 setup(
     name='overpass',
     packages=['overpass'],
-    version='0.5.0',
+    version='0.5.4',
     description='Python wrapper for the OpenStreetMap Overpass API',
     long_description=long_description,
     author='Martijn van Exel',