diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index dee6d6491c1b7493f0366f96001baf71f06f77cc..d299fc19b4d043ba527d466258d17131e3681cc1 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -5,7 +5,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: [2.7, 3.5, 3.6, 3.7, 3.8]
+        python-version: [3.5, 3.6, 3.7, 3.8]
     steps:
     - name: Checkout
       uses: actions/checkout@v2
diff --git a/HISTORY.rst b/HISTORY.rst
index 9e9cb843d1483f47e1c4dd06a0e8e7fc4c092829..f970c2ee0cb5ceff6a4febaa21e1b67ac7cb6b9e 100644
--- a/HISTORY.rst
+++ b/HISTORY.rst
@@ -1,6 +1,19 @@
 History
 =======
 
+1.4.0 (2020-09-26)
+------------------
+
+* Dropping support for Python 2.x
+* --upsample a parameter for command line face_recognition
+
+1.3.0 (2020-02-20)
+------------------
+
+* Drop support for Python 3.4 and add 3.8
+* Blink detection example
+
+
 1.2.3 (2018-08-21)
 ------------------
 
diff --git a/Makefile b/Makefile
index 5af87c9f6d7df4cf6ebdccafcb40eb6a05f2b1d0..5e90960b1475db3ec475230c539c30154e90c354 100644
--- a/Makefile
+++ b/Makefile
@@ -75,8 +75,9 @@ servedocs: docs ## compile the docs watching for changes
 	watchmedo shell-command -p '*.rst' -c '$(MAKE) -C docs html' -R -D .
 
 release: clean ## package and upload a release
-	python3 setup.py sdist upload
-	python3 setup.py bdist_wheel upload
+	python3 setup.py sdist
+	python3 setup.py bdist_wheel
+	twine upload dist/*
 
 dist: clean ## builds source and wheel package
 	python3 setup.py sdist
diff --git a/face_recognition/__init__.py b/face_recognition/__init__.py
index 5c96187e0a17e3ed9990f864fca5d218f6a2ebb1..6e91db046fbb293f1177c8b634a1d3777d2b8ae1 100644
--- a/face_recognition/__init__.py
+++ b/face_recognition/__init__.py
@@ -2,6 +2,6 @@
 
 __author__ = """Adam Geitgey"""
 __email__ = 'ageitgey@gmail.com'
-__version__ = '1.2.3'
+__version__ = '1.4.0'
 
 from .api import load_image_file, face_locations, batch_face_locations, face_landmarks, face_encodings, compare_faces, face_distance
diff --git a/setup.cfg b/setup.cfg
index 569ed72b974493848d63596714c88eb261ee75e2..623cf4d4638574ee236de90966fde6f5d711ecfe 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 1.3.0
+current_version = 1.4.0
 commit = True
 tag = True
 
diff --git a/setup.py b/setup.py
index 3a1e8e11581fc6a4bce161f6e602c017029ae4e2..aa1233a0ac7df7b94a3b0e44a0280e741f2afcc9 100644
--- a/setup.py
+++ b/setup.py
@@ -24,7 +24,7 @@ test_requirements = [
 
 setup(
     name='face_recognition',
-    version='1.3.0',
+    version='1.4.0',
     description="Recognize faces from Python or from the command line",
     long_description=readme + '\n\n' + history,
     author="Adam Geitgey",
@@ -52,8 +52,6 @@ setup(
         'Intended Audience :: Developers',
         'License :: OSI Approved :: MIT License',
         'Natural Language :: English',
-        "Programming Language :: Python :: 2",
-        'Programming Language :: Python :: 2.7',
         'Programming Language :: Python :: 3',
         'Programming Language :: Python :: 3.5',
         'Programming Language :: Python :: 3.6',
diff --git a/tox.ini b/tox.ini
index 02284ff7187c3c83bb6856b861858535a8f6676b..014075705958d1193991f5cb669bc4da7b316551 100644
--- a/tox.ini
+++ b/tox.ini
@@ -10,7 +10,6 @@ envlist =
 
 [gh-actions]
 python =
-    2.7: py27, flake8
     3.5: py35, flake8
     3.6: py36, flake8
     3.7: py37, flake8
@@ -19,7 +18,7 @@ python =
 
 [testenv]
 commands =
-    python setup.py test
+    python -m unittest discover
 
 
 [testenv:flake8]