diff --git a/README.md b/README.md
deleted file mode 100644
index d0deee7..0000000
--- a/README.md
+++ /dev/null
@@ -1,13 +0,0 @@
-# fodselsnummer
-Used to generate and validate Norwegian birth numbers ("fødselsnummer")
-
-## Installation
-python setup.py install
-
-## Testing
-python -m unittest tests.fodselsnummer_tests
-
-## Example usage
-import fodselsnummer
-
-fodselsnummer.check_fnr('12345678900')
diff --git a/README.rst b/README.rst
new file mode 100644
index 0000000..c790d22
--- /dev/null
+++ b/README.rst
@@ -0,0 +1,31 @@
+fodselsnummer
+=============
+
+.. image:: https://travis-ci.org/magnuswatn/fodselsnummer.svg?branch=master
+    :target: https://travis-ci.org/magnuswatn/fodselsnummer
+
+.. image:: https://codecov.io/gh/magnuswatn/fodselsnummer/branch/master/graph/badge.svg
+    :target: https://codecov.io/gh/magnuswatn/fodselsnummer
+
+.. image:: https://badge.fury.io/py/fodselsnummer.svg
+    :target: https://badge.fury.io/py/fodselsnummer
+
+Used to generate and validate Norwegian birth numbers ("fødselsnummer").
+
+Installation
+------------
+
+.. code-block:: bash
+
+    $ pipenv install fodselsnummer
+
+
+
+Example usage
+-------------
+
+.. code-block:: python
+
+    import fodselsnummer
+
+    fodselsnummer.check_fnr('12345678900')
diff --git a/setup.py b/setup.py
index 3ac080b..ae0d8ff 100644
--- a/setup.py
+++ b/setup.py
@@ -1,14 +1,27 @@
+import os
+import codecs
+
 try:
     from setuptools import setup
 except ImportError:
     from distutils.core import setup
 
+def read_file(filename, encoding='utf8'):
+    """Read unicode from given file."""
+    with codecs.open(filename, encoding=encoding) as fd:
+        return fd.read()
+
+here = os.path.abspath(os.path.dirname(__file__))
+readme = read_file(os.path.join(here, 'README.rst'))
+
 setup(
     name='fodselsnummer',
     description='For generating and validating of Norwegian "birth numbers" (fodselsnummer)',
-    version='1.1',
+    long_description=readme,
+    version='1.5',
     license='MIT',
     author='Magnus Watn',
+    keywords='fodselsnummer personnummer norway',
     url='https://github.com/magnuswatn/fodselsnummer',
     py_modules=['fodselsnummer'],
     classifiers=[
@@ -16,6 +29,10 @@
         'Intended Audience :: Developers',
         'License :: OSI Approved :: MIT License',
         'Programming Language :: Python :: 2',
+        'Programming Language :: Python :: 2.7',
         'Programming Language :: Python :: 3',
+        'Programming Language :: Python :: 3.4',
+        'Programming Language :: Python :: 3.5',
+        'Programming Language :: Python :: 3.6',
         ],
 )