diff --git a/README.rst b/README.rst
index 0e2bef4..056afd7 100644
--- a/README.rst
+++ b/README.rst
@@ -1,6 +1,8 @@
 RIPE Atlas Tools (Magellan) |Documentation|
 ===========================================
 
+|Build Status| |PYPI Version| |Python Versions| |Python Implementations| |Python Format|
+
 The official command-line client for RIPE Atlas.
 
 
@@ -74,3 +76,9 @@ suggestion was for Magellan, *"in memory of those times when RTT was ~3 years"*.
 .. _ReadTheDocs: https://ripe-atlas-tools.readthedocs.org/
 .. _guide: https://github.com/RIPE-NCC/ripe-atlas-tools/blob/master/CONTRIBUTING.rst
 .. _poll: https://github.com/RIPE-NCC/ripe-atlas-tools/issues/13
+.. |Build Status| image:: https://travis-ci.org/RIPE-NCC/ripe-atlas-tools.png?branch=master
+   :target: https://travis-ci.org/RIPE-NCC/ripe-atlas-tools
+.. |PYPI Version| image:: https://img.shields.io/pypi/v/ripe.atlas.tools.svg
+.. |Python Versions| image:: https://img.shields.io/pypi/pyversions/ripe.atlas.tools.svg
+.. |Python Implementations| image:: https://img.shields.io/pypi/implementation/ripe.atlas.tools.svg
+.. |Python Format| image:: https://img.shields.io/pypi/format/ripe.atlas.tools.svg
diff --git a/ripe/atlas/tools/version.py b/ripe/atlas/tools/version.py
index b1a19e3..5becc17 100644
--- a/ripe/atlas/tools/version.py
+++ b/ripe/atlas/tools/version.py
@@ -1 +1 @@
-__version__ = "0.0.5"
+__version__ = "1.0.0"
diff --git a/setup.cfg b/setup.cfg
new file mode 100644
index 0000000..5e40900
--- /dev/null
+++ b/setup.cfg
@@ -0,0 +1,2 @@
+[wheel]
+universal = 1
diff --git a/setup.py b/setup.py
index 8b11031..bffe153 100644
--- a/setup.py
+++ b/setup.py
@@ -52,13 +52,17 @@
             "scripts/antp",
             "scripts/ripe-atlas",
         ],
+        keywords=['RIPE', 'RIPE NCC', 'RIPE Atlas', 'Command Line'],
         classifiers=[
+            "License :: OSI Approved :: GNU General Public License v3 (GPLv3)",
             "Operating System :: POSIX",
             "Operating System :: Unix",
             "Programming Language :: Python",
             "Programming Language :: Python :: 2.7",
             "Programming Language :: Python :: 3.3",
             "Programming Language :: Python :: 3.4",
+            "Programming Language :: Python :: Implementation :: CPython",
+            "Programming Language :: Python :: Implementation :: PyPy",
             "Topic :: Internet :: WWW/HTTP",
         ],
     )