merge with master

README.md

@@ -1,18 +1,15 @@
+[![Travis](https://travis-ci.org/cliqz-oss/keyvi.svg?branch=master  "Travis build status")](https://travis-ci.org/cliqz-oss/keyvi)
+[![PythonVersions](https://img.shields.io/pypi/pyversions/pykeyvi.svg)](https://pypi.python.org/pypi/pykeyvi/)
+[![PythonImpl](https://img.shields.io/pypi/implementation/pykeyvi.svg)](https://pypi.python.org/pypi/pykeyvi/)
+[![PythonFormat](https://img.shields.io/pypi/format/pykeyvi.svg)](https://pypi.python.org/pypi/pykeyvi/)
+[![PyPIVersion](https://img.shields.io/pypi/v/pykeyvi.svg)](https://pypi.python.org/pypi/pykeyvi/)
+[![Coveralls](https://coveralls.io/repos/cliqz-oss/keyvi/badge.svg?branch=master&service=github)](https://coveralls.io/github/cliqz-oss/keyvi?branch=master)
+
+##
 ![Keyvi](/doc/images/keyvi-small.png)
 
 Keyvi - the short form for "Key value index" - defines a special subtype of the popular key value store (KVS) technologies. As you can imagine from the name, keyvi is an immutable key value store, therefore an index not a store. Keyvi's strengths: high compression ratio and extreme scalability. So if you need online read/writes keyvi is not for you, however, if your use case is mostly reads and infrequent writes you might be interested in checking keyvi out.
 
-## Build status
-
-| [Linux][build-link] | [OS X][build-link]  | [Coveralls][cov-link] |
-| :-----------------: | :-----------------: | :-------------------: |
-| ![build-badge]      | ![build-badge]      | ![cov-badge]          |
-
-[build-badge]: https://travis-ci.org/cliqz-oss/keyvi.svg?branch=master "Travis build status"
-[build-link]:  https://travis-ci.org/cliqz-oss/keyvi "Travis build status"
-[cov-badge]: https://coveralls.io/repos/cliqz-oss/keyvi/badge.svg?branch=master&service=github
-[cov-link]:  https://coveralls.io/github/cliqz-oss/keyvi?branch=master
-
 ## Introduction
   * [BBuzz2016 talk](https://www.youtube.com/watch?v=GBjisdmHe4g)
   * [Announcement blog post](https://cliqz.com/en/aboutus/blog/keyvi)

pykeyvi/setup.py

@@ -220,8 +220,8 @@ def run(self):
 
     setup(
         name=PACKAGE_NAME,
-        version='0.1.35',
-        description='Python bindings for keyvi',
+        version='0.1.36',
+        description='Python package for keyvi',
         author='Hendrik Muhs',
         author_email='hendrik.muhs@gmail.com',
         license="ASL 2.0",
@@ -231,8 +231,19 @@ def run(self):
         ext_modules=ext_modules,
         zip_safe=False,
         url='https://github.com/cliqz/keyvi',
-        download_url='https://github.com/cliqz/keyvi/tarball/v0.1.35',
+        download_url='https://github.com/cliqz/keyvi/tarball/v0.1.36',
         keywords=['FST'],
-        classifiers=[],
+        classifiers=[
+            'Programming Language :: C++',
+            'Programming Language :: Cython',
+            'Programming Language :: Python',
+            'Programming Language :: Python :: 2.7',
+            'Programming Language :: Python :: 3.4',
+            'Programming Language :: Python :: 3.5',
+            'Programming Language :: Python :: Implementation :: CPython',
+            'Programming Language :: Python :: Implementation :: PyPy',
+            'Operating System :: MacOS :: MacOS X',
+            'Operating System :: Unix',
+        ],
         install_requires=install_requires,
     )