diff --git a/AUTHORS.rst b/AUTHORS.rst
index 1dde5c8..e1bc83a 100644
--- a/AUTHORS.rst
+++ b/AUTHORS.rst
@@ -13,6 +13,7 @@ These people have contributed to `pytest-bdd`, in alphabetical order:
 * `Andrey Makhnach <andrey.makhnach@gmail.com>`_
 * `Aron Curzon <curzona@gmail.com>`_
 * `Dmitrijs Milajevs <dimazest@gmail.com>`_
+* `Dmitry Kolyagin <pauk-slon>`_
 * `Florian Bruhin <me@the-compiler.org>`_
 * `Floris Bruynooghe <flub@devork.be>`_
 * `Harro van der Klauw <hvdklauw@gmail.com>`_
diff --git a/CHANGES.rst b/CHANGES.rst
index 51a8d14..797a022 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -2,6 +2,12 @@ Changelog
 =========
 
 
+2.21.0
+------
+
+- Gherkin terminal reporter expanded format (pauk-slon)
+
+
 2.20.0
 ------
 
diff --git a/README.rst b/README.rst
index 7acdd8e..7500e4a 100644
--- a/README.rst
+++ b/README.rst
@@ -1150,6 +1150,14 @@ To enable gherkin-formatted output on terminal, use
     py.test --gherkin-terminal-reporter
 
 
+Terminal reporter supports expanded format as well
+
+::
+
+    py.test --gherkin-terminal-reporter-expanded
+
+
+
 Test code generation helpers
 ----------------------------
 
diff --git a/pytest_bdd/__init__.py b/pytest_bdd/__init__.py
index ad3121a..593c284 100644
--- a/pytest_bdd/__init__.py
+++ b/pytest_bdd/__init__.py
@@ -3,6 +3,6 @@
 from pytest_bdd.steps import given, when, then
 from pytest_bdd.scenario import scenario, scenarios
 
-__version__ = '2.20.0'
+__version__ = '2.21.0'
 
 __all__ = [given.__name__, when.__name__, then.__name__, scenario.__name__, scenarios.__name__]
diff --git a/tests/feature/test_gherkin_terminal_reporter.py b/tests/feature/test_gherkin_terminal_reporter.py
index d99e2bf..1fab659 100644
--- a/tests/feature/test_gherkin_terminal_reporter.py
+++ b/tests/feature/test_gherkin_terminal_reporter.py
@@ -123,7 +123,7 @@ def gherkin_scenario_outline(testdir):
         Given there are <start> cucumbers
         When I eat <eat> cucumbers
         Then I should have <left> cucumbers
-        
+
         Examples:
         | start | eat | left |
         |{start}|{eat}|{left}|
@@ -135,7 +135,7 @@ def gherkin_scenario_outline(testdir):
         @given('there are <start> cucumbers')
         def start_cucumbers(start):
             return start
-        
+
         @when('I eat <eat> cucumbers')
         def eat_cucumbers(start_cucumbers, eat):
             pass
diff --git a/tests/feature/test_no_sctrict_gherkin.py b/tests/feature/test_no_sctrict_gherkin.py
index 5a8a827..90f264e 100644
--- a/tests/feature/test_no_sctrict_gherkin.py
+++ b/tests/feature/test_no_sctrict_gherkin.py
@@ -1,6 +1,5 @@
 """Test no strict gherkin for sections."""
 
-import py
 import pytest
 
 from pytest_bdd import (
@@ -25,6 +24,7 @@ def test_background_no_strict_gherkin(request):
 
     test(request)
 
+
 def test_scenario_no_strict_gherkin(request):
     """Test scenario no strict gherkin."""
     @scenario(
@@ -56,4 +56,3 @@ def not_boolean(foo):
 @when('foo has not a value "baz"')
 def has_not_baz(foo):
     assert "baz" not in foo
-