diff --git a/README.md b/README.md
index e74210b26a57cf2b30bf0574c367edaa62fb7e74..7a85c9da4ae3a52fb9430f36da149a6072924386 100644
--- a/README.md
+++ b/README.md
@@ -88,7 +88,9 @@ The location of this script may vary depending on your Linux distro
 Cadbiom software requires a SAT solver which is
 proposed as a Python wrapper by an independant library (pycryptosat).
 
-*For now, pycryptosat is not on pypi; so we use a fork from
+*For now, an non official version of pycryptosat is on pypi and it is used by packages; 
+
+Source of the fork if you want to compile it manually:
 [Cryptominisat repository](https://github.com/msoos/cryptominisat/tree/5.0.1)*
 
 Here you will find the installation commands of the pycryptosat package:
@@ -101,6 +103,12 @@ Here you will find the installation commands of the pycryptosat package:
 
 ### Cadbiom
 
+If you want to install from pypi, just do:
+
+    pip install cadbiom-cmd
+    pip install cadbiom-gui
+
+
 If you want to install the library with its GUI, and command line in one command,
 after the git clone step, just do:
 
diff --git a/command_line/Makefile b/command_line/Makefile
index b33941ca6e6d52012b0b2aef8e48b3d162060d85..c01cd0e0d2c5ed27be1ca11232c316c8d7f2bf78 100644
--- a/command_line/Makefile
+++ b/command_line/Makefile
@@ -37,6 +37,6 @@ unit_tests:
 	@echo Launch unit tests
 	python2.7 setup.py test
 
-upload:
-	python2.7 setup.py sdist
+upload: clean sdist
+	python setup.py bdist_wheel
 	twine upload dist/* -r pypi_inria
diff --git a/command_line/setup.py b/command_line/setup.py
index ad3c8bc81a196ea921630a1c2592d51f09338363..a24c950fbddb026602c687a8273d76450e0358d8 100644
--- a/command_line/setup.py
+++ b/command_line/setup.py
@@ -31,7 +31,7 @@ from setuptools import setup, find_packages
 from setuptools.command.test import test as TestCommand
 from sys import version_info
 
-__PACKAGE_VERSION__ = "0.1.0"
+__PACKAGE_VERSION__ = "0.1.1"
 __LIBRARY_VERSION__ = "0.1.0"
 
 deps = []
@@ -60,7 +60,7 @@ setup(
 
     # Library name & version
     name='cadbiom_cmd',
-    version=__LIBRARY_VERSION__,
+    version=__PACKAGE_VERSION__,
 
     # Search all packages recursively
     packages=find_packages(),
diff --git a/gui/MANIFEST.in b/gui/MANIFEST.in
index 4e2ebad83cea43535bf72e6e7054c2e8d9bbde99..3944dfd266b3f0b9c91c46e16ccd9b2e1c03b032 100644
--- a/gui/MANIFEST.in
+++ b/gui/MANIFEST.in
@@ -1,2 +1,3 @@
+include README.md
 recursive-include cadbiom_gui/gt_gui/chart_glade/ *.glade
 include cadbiom_gui/gt_gui/legend.png
diff --git a/gui/Makefile b/gui/Makefile
index 401f127a04469482410c25dc7b1a4f9e901a8906..1f1f23a03b023503193252fb8f3863b51fd3444f 100644
--- a/gui/Makefile
+++ b/gui/Makefile
@@ -33,6 +33,6 @@ dev_uninstall:
 	@echo Uninstalling the package for developers...
 	python2.7 setup.py develop --uninstall
 
-upload:
-	python2.7 setup.py sdist
+upload: clean sdist
+	python setup.py bdist_wheel
 	twine upload dist/* -r pypi_inria
diff --git a/gui/setup.py b/gui/setup.py
index da9319cb239aac1781c146e60502b81e2fb65b1c..f74668e3051a66d32efa64261687e5f7a78b8233 100644
--- a/gui/setup.py
+++ b/gui/setup.py
@@ -32,14 +32,14 @@
 # Standard imports
 from setuptools import setup, find_packages
 
-__PACKAGE_VERSION__ = "0.1.0"
+__PACKAGE_VERSION__ = "0.1.1"
 __LIBRARY_VERSION__ = "0.1.0"
 
 setup(
 
     # Library name & version
     name='cadbiom_gui',
-    version=__LIBRARY_VERSION__,
+    version=__PACKAGE_VERSION__,
 
     # Search all packages recursively
     packages=find_packages(),
diff --git a/library/Makefile b/library/Makefile
index e610e1e4147363a9ad38fd8e13566a8911a42ed4..1ee50349b8a0e94af8657982603d0321c31082aa 100644
--- a/library/Makefile
+++ b/library/Makefile
@@ -38,6 +38,5 @@ unit_tests:
 	@echo Launch unit tests
 	python2.7 setup.py test
 
-upload:
-	python2.7 setup.py sdist
+upload: clean sdist
 	twine upload dist/* -r pypi_inria
diff --git a/library/README.md b/library/README.md
index e74210b26a57cf2b30bf0574c367edaa62fb7e74..7a85c9da4ae3a52fb9430f36da149a6072924386 100644
--- a/library/README.md
+++ b/library/README.md
@@ -88,7 +88,9 @@ The location of this script may vary depending on your Linux distro
 Cadbiom software requires a SAT solver which is
 proposed as a Python wrapper by an independant library (pycryptosat).
 
-*For now, pycryptosat is not on pypi; so we use a fork from
+*For now, an non official version of pycryptosat is on pypi and it is used by packages; 
+
+Source of the fork if you want to compile it manually:
 [Cryptominisat repository](https://github.com/msoos/cryptominisat/tree/5.0.1)*
 
 Here you will find the installation commands of the pycryptosat package:
@@ -101,6 +103,12 @@ Here you will find the installation commands of the pycryptosat package:
 
 ### Cadbiom
 
+If you want to install from pypi, just do:
+
+    pip install cadbiom-cmd
+    pip install cadbiom-gui
+
+
 If you want to install the library with its GUI, and command line in one command,
 after the git clone step, just do:
 
diff --git a/library/setup.py b/library/setup.py
index c420d4f0a6491e3a5aede392482851e117cb9acc..eb4171e2543266141004c3465957d6f4acfe06ae 100644
--- a/library/setup.py
+++ b/library/setup.py
@@ -35,7 +35,7 @@ from distutils import sysconfig
 from setuptools import setup, Extension, find_packages
 from setuptools.command.test import test as TestCommand
 
-__PACKAGE_VERSION__ = "0.1.0"
+__PACKAGE_VERSION__ = "0.1.1"
 __LIBRARY_VERSION__ = "0.1.0"
 
 ################################################################################
@@ -116,7 +116,7 @@ modules = [
 
 setup(
     name="cadbiom",
-    version=__LIBRARY_VERSION__,
+    version=__PACKAGE_VERSION__,
     author="Pierre Vignet",
     author_email="pierre.vignet@irisa.fr",
     url = "https://gitlab.irisa.fr/0000B8EG/Cadbiom/tree/pypi_packaging",