diff --git a/.travis.yml b/.travis.yml
index e1957f877..9b9692b9e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -11,6 +11,7 @@ script:
 - python scripts/readme.py
 - python scripts/tdd.py
 - python3 website/main.py
+- python3 scripts/auto-lint.py
 after_success:
 - chmod +x .travis/push.sh
 - .travis/push.sh
diff --git a/scripts/auto-lint.py b/scripts/auto-lint.py
new file mode 100644
index 000000000..1e2f93093
--- /dev/null
+++ b/scripts/auto-lint.py
@@ -0,0 +1,10 @@
+import autopep8
+import os
+import util
+snippets = util.read_snippets()
+for snippet in snippets:
+    formatedCode = autopep8.fix_code(snippet.read_code()).strip()
+    fixedCode = snippet.content.replace(snippet.read_code(),formatedCode)
+    snippetFile = open(f"snippets/{snippet.name}.md",'w')
+    snippetFile.write(fixedCode)
+    snippetFile.close()
\ No newline at end of file
diff --git a/scripts/lint.py b/scripts/lint.py
index 1e2f93093..1e8dd29c7 100644
--- a/scripts/lint.py
+++ b/scripts/lint.py
@@ -1,10 +1,9 @@
-import autopep8
-import os
-import util
-snippets = util.read_snippets()
-for snippet in snippets:
-    formatedCode = autopep8.fix_code(snippet.read_code()).strip()
-    fixedCode = snippet.content.replace(snippet.read_code(),formatedCode)
-    snippetFile = open(f"snippets/{snippet.name}.md",'w')
-    snippetFile.write(fixedCode)
-    snippetFile.close()
\ No newline at end of file
+import util
+import subprocess
+import sys
+for snippet in util.read_snippets():
+    code = snippet.read_code()
+    check_1 = subprocess.run(['flake8', '-','--select=E901,E999,F821,F822,F823','--count','--show-source','--statistics'], input=code, encoding='utf8',stdout=subprocess.PIPE)
+    check_2 = subprocess.run(['flake8', '-','--exit-zero','--max-complexity=10','--count','--max-line-length=127','--statistics','--ignore=W292'], input=code, encoding='utf8',stdout=subprocess.PIPE)
+    check_1.check_returncode()
+    check_2.check_returncode()
\ No newline at end of file