diff --git a/README.md b/README.md
index 7894ea5..5bdb6fb 100644
--- a/README.md
+++ b/README.md
@@ -1,8 +1,8 @@
 # u-msgpack-python v1.4
 
-u-msgpack-python is a lightweight [MessagePack](http://msgpack.org/) serializer and deserializer module, compatible with both Python 2 and Python 3. u-msgpack-python is fully compliant with the latest [MessagePack specification](https://github.com/msgpack/msgpack/blob/master/spec.md). In particular, it supports the new binary, UTF-8 string, and application ext types.
+u-msgpack-python is a lightweight [MessagePack](http://msgpack.org/) serializer and deserializer module, compatible with both Python 2 and 3, as well CPython and PyPy implementations of Python. u-msgpack-python is fully compliant with the latest [MessagePack specification](https://github.com/msgpack/msgpack/blob/master/spec.md). In particular, it supports the new binary, UTF-8 string, and application ext types.
 
-u-msgpack-python is written in pure Python and is currently distributed as a single file: [umsgpack.py](umsgpack.py) and on PyPI: https://pypi.python.org/pypi/u-msgpack-python
+u-msgpack-python is written in pure Python and is currently distributed on PyPI: https://pypi.python.org/pypi/u-msgpack-python and as a single file: [umsgpack.py](https://raw.github.com/vsergeev/u-msgpack-python/master/umsgpack.py)
 
 ## Installation
 
@@ -211,7 +211,13 @@ If a non-byte-string argument is passed to `umsgpack.unpackb()`, it will raise a
 
 ## Testing
 
-u-msgpack-python's included unit tests may be run with [pytest](http://pytest.org). Simply invoke `py.test` or `py.test2` to test in either Python 3 or Python 2.
+u-msgpack-python's included unit tests may be run with `test_umsgpack.py`, under your favorite interpreter.
+
+``` text
+$ python test_umsgpack.py
+$ python2 test_umsgpack.py
+$ pypy test_umsgpack.py
+```
 
 ## License
 
diff --git a/msgpack.org.md b/msgpack.org.md
index dee3141..0ab1ad4 100644
--- a/msgpack.org.md
+++ b/msgpack.org.md
@@ -1,8 +1,8 @@
 # u-msgpack-python v1.4
 
-u-msgpack-python is a lightweight [MessagePack](http://msgpack.org/) serializer and deserializer module, compatible with both Python 2 and Python 3. u-msgpack-python is fully compliant with the latest [MessagePack specification](https://github.com/msgpack/msgpack/blob/master/spec.md).
+u-msgpack-python is a lightweight [MessagePack](http://msgpack.org/) serializer and deserializer module, compatible with both Python 2 and 3, as well CPython and PyPy implementations of Python. u-msgpack-python is fully compliant with the latest [MessagePack specification](https://github.com/msgpack/msgpack/blob/master/spec.md).
 
-u-msgpack-python is written in pure Python and is currently distributed as a single file: [umsgpack.py](umsgpack.py) and on PyPI: https://pypi.python.org/pypi/u-msgpack-python
+u-msgpack-python is written in pure Python and is currently distributed on PyPI: https://pypi.python.org/pypi/u-msgpack-python and as a single file: [umsgpack.py](https://raw.github.com/vsergeev/u-msgpack-python/master/umsgpack.py)
 
 ## Installation
 
diff --git a/setup.py b/setup.py
index 9dec3a3..1cb0b9a 100644
--- a/setup.py
+++ b/setup.py
@@ -8,7 +8,7 @@
     author_email='vsergeev at gmail',
     url='https://github.com/vsergeev/u-msgpack-python',
     py_modules=['umsgpack'],
-    long_description="""u-msgpack-python is a lightweight `MessagePack <http://msgpack.org/>`_ serializer and deserializer module, compatible with both Python 2 and Python 3. u-msgpack-python is fully compliant with the latest `MessagePack specification <https://github.com/msgpack/msgpack/blob/master/spec.md>`_. In particular, it supports the new binary, UTF-8 string, and application ext types. See https://github.com/vsergeev/u-msgpack-python for more information.""",
+    long_description="""u-msgpack-python is a lightweight `MessagePack <http://msgpack.org/>`_ serializer and deserializer module, compatible with both Python 2 and Python 3, as well as CPyhton and PyPy implementations of Python. u-msgpack-python is fully compliant with the latest `MessagePack specification <https://github.com/msgpack/msgpack/blob/master/spec.md>`_. In particular, it supports the new binary, UTF-8 string, and application ext types. See https://github.com/vsergeev/u-msgpack-python for more information.""",
     classifiers=[
         "Development Status :: 5 - Production/Stable",
         "License :: OSI Approved :: MIT License",
@@ -16,6 +16,8 @@
         "Programming Language :: Python",
         "Programming Language :: Python :: 2",
         "Programming Language :: Python :: 3",
+        "Programming Language :: Python :: Implementation :: CPython",
+        "Programming Language :: Python :: Implementation :: PyPy",
     ],
     license='MIT',
     keywords='msgpack serialization deserialization',