diff --git a/.coveragerc b/.coveragerc
index 38fb229..d97cd56 100644
--- a/.coveragerc
+++ b/.coveragerc
@@ -3,7 +3,6 @@
 # branch = True
 concurrency = multiprocessing
 omit = /usr/lib/python3/*,tests/*
-
 [report]
 # Regexes for lines to exclude from consideration
 exclude_lines =
diff --git a/Makefile b/Makefile
index c4012da..3f311a0 100644
--- a/Makefile
+++ b/Makefile
@@ -4,11 +4,12 @@ DESTDIR=/
 BUILDIR=$(CURDIR)/debian/pymanager
 PROJECT=pymanager
 VERSION=1.0.0
-OMIT_COVERGAGE=--omit=/usr/lib/python3/*,tests/*
+#OMIT_COVERGAGE=--omit=/usr/lib/python3/*,tests/*
 
 all:
 	@echo "make sdist - Create source package"
 	@echo "make bdist - Create package"
+	@echo "make bdist_wheel - Create package wheel"
 	@echo "make test - Test"
 	@echo "make coverage - coverage"
 	@echo "make htmldoc - generate html doc (out : doc/build)"
@@ -22,20 +23,20 @@ sdist:
 bdist:
 	$(PYTHON) setup.py bdist $(COMPILE)
 
+bdist_wheel:
+	$(PYTHON) setup.py bdist_wheel $(COMPILE)
+
 test:
 	$(PYTHON) setup.py test
 
 coverage:
 	$(PYTHONCOVERAGE) erase
-	$(PYTHONCOVERAGE) run -a ${OMIT_COVERGAGE} pymanager/certificate.py --version
-	$(PYTHONCOVERAGE) run -a ${OMIT_COVERGAGE} tests/test_certificate.py
-	$(PYTHONCOVERAGE) run -a ${OMIT_COVERGAGE} pymanager/manager.py --version
-	$(PYTHONCOVERAGE) run -a ${OMIT_COVERGAGE} tests/test_manager.py
-	$(PYTHONCOVERAGE) run -a ${OMIT_COVERGAGE} pymanager/client.py --version
-	$(PYTHONCOVERAGE) run -a ${OMIT_COVERGAGE} tests/test_client.py
-	$(PYTHONCOVERAGE) run -a ${OMIT_COVERGAGE} pymanager/password.py --version
-	$(PYTHONCOVERAGE) run -a ${OMIT_COVERGAGE} tests/test_password.py
-	$(PYTHONCOVERAGE) report # ${OMIT_COVERGAGE}
+	$(PYTHONCOVERAGE) run -a tests/test_certificate.py
+	$(PYTHONCOVERAGE) run -a tests/test_manager.py 
+	$(PYTHONCOVERAGE) run -a tests/test_client.py
+	$(PYTHONCOVERAGE) run -a tests/test_password.py
+	$(PYTHONCOVERAGE) combine
+	$(PYTHONCOVERAGE) report
 	$(PYTHONCOVERAGE) html
 
 htmldoc: