diff --git a/Makefile b/Makefile
index 7609444bd4fd3a8ce980eca0bc3993b3cf2e168f..bf90a5c51a61a25ba65693575a087f5d8bba2b11 100644
--- a/Makefile
+++ b/Makefile
@@ -34,3 +34,12 @@ install:
 
 unittest:
 	pytest-3 unittests
+
+style:
+	pycodestyle --count src unittests
+	autopep8 -ar --diff --exit-code --exclude swagger_client .
+.PHONY: style
+
+lint:
+	pylint --unsafe-load-any-extension=y -d all -e E,F --ignore=swagger_client src/caosadvancedtools
+.PHONY: lint