diff --git a/AUTHORS.md b/AUTHORS.md
index d82ccb599fe9..c1a294c8c38b 100644
--- a/AUTHORS.md
+++ b/AUTHORS.md
@@ -120,6 +120,7 @@ Mor
 Nat-1
 Nicola Fonzi
 Nijso Beishuizen
+Nikita Ageev
 Ole Burghardt
 Patrick Mischke
 Paul Urbanczyk
diff --git a/SU2_PY/SU2/io/tools.py b/SU2_PY/SU2/io/tools.py
index aaeccf9433fc..a7c89fc4d5a5 100755
--- a/SU2_PY/SU2/io/tools.py
+++ b/SU2_PY/SU2/io/tools.py
@@ -271,8 +271,10 @@ def getTurboPerfIndex(nZones=1):
     "NACELLE_MAX_TWIST",
 ]
 
+# SU2_GEO numbers the stations of GEO_LOCATION_STATIONS from 1 (STATION1_*),
+# see SU2_GEO.cpp, so the names cover stations 1 to 20.
 PerStation = []
-for i in range(20):
+for i in range(1, 21):
     PerStation.append("STATION" + str(i) + "_AREA")
     PerStation.append("STATION" + str(i) + "_LENGTH")
     PerStation.append("STATION" + str(i) + "_WIDTH")
diff --git a/config_template.cfg b/config_template.cfg
index 88533d33c689..3480f09fcc61 100644
--- a/config_template.cfg
+++ b/config_template.cfg
@@ -2212,7 +2212,7 @@ GEO_DESCRIPTION= AIRFOIL
 % Z location of the waterline
 GEO_WATERLINE_LOCATION= 0.0
 %
-% Coordinate of the stations to be analyzed
+% Coordinate of the stations to be analyzed (STATION1_* ... STATIONn_* in SU2_GEO output, n <= 20 for SU2_PY)
 GEO_LOCATION_STATIONS= (0.0, 0.5, 1.0)
 %
 % Definition of the nacelle location (higlite coordinates, tilt angle, toe angle)
@@ -2727,7 +2727,7 @@ REORIENT_ELEMENTS= YES
 %    AIRFOIL_AREA, AIRFOIL_THICKNESS, AIRFOIL_CHORD, AIRFOIL_TOC, AIRFOIL_AOA,
 %    WING_VOLUME, WING_MIN_THICKNESS, WING_MAX_THICKNESS, WING_MAX_CHORD, WING_MIN_TOC, WING_MAX_TWIST, WING_MAX_CURVATURE, WING_MAX_DIHEDRAL
 %    STATION#_WIDTH, STATION#_AREA, STATION#_THICKNESS, STATION#_CHORD, STATION#_TOC,
-%    STATION#_TWIST (where # is the index of the station defined in GEO_LOCATION_STATIONS)
+%    STATION#_TWIST (where # is the 1-based index, 1 to 20, of the station defined in GEO_LOCATION_STATIONS)
 %
 % Available design variables
 % 2D Design variables