diff --git a/README b/README
index f32d746bd9ad5cd803bd66007b3c794c3d0bbdbd..8328f812efd4525f133de65375a9a2fce5419855 100644
--- a/README
+++ b/README
@@ -141,6 +141,28 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
Change history
--------------
+Version 2.21a (04/01/2016)
+
+- The GUI (graphical) front end to generateDS.py has been
+ resuscitated and is now working again thanks to Aleksandr
+ Dragunkin.
+ The GUI front end must be run under Python 3, and you must install
+ Python support for Gtk.
+ Aleksandr has also provided a Russian translation of the labels
+ etc in the user interface. You can run that with:
+
+ $ cd /path/to/generateds/gui
+ $ python3 generateds_gui.py --impl-gui=generateds_gui_ru.glade
+
+ Note that the GUI interface still lacks support for a few of the
+ command line options that were added most recently to
+ generateDS.py. If you need one or more of those missing options
+ but would still like to use the GUI front end, you can consider
+ using the "Capture CL" under the Tools menu, and then copy and
+ paste the result into a shell script, add any needed options to
+ that script, and run the script from the command line.
+
+
Version 2.20b (03/28/2016)
- Fixes to handling of simpleType with and without restrictions on
diff --git a/generateDS.html b/generateDS.html
index bf07b0ef8080be09875568b8ce6a649a90e31bd1..903478ea2008bf9e02870dfc7e884d96434dcf4e 100644
--- a/generateDS.html
+++ b/generateDS.html
@@ -220,7 +220,7 @@ They are used by updateversion.py. -->
<col class="field-name" />
<col class="field-body" />
<tbody valign="top">
-<tr class="field"><th class="field-name">revision:</th><td class="field-body">2.20b</td>
+<tr class="field"><th class="field-name">revision:</th><td class="field-body">2.21a</td>
</tr>
</tbody>
</table>
@@ -229,7 +229,7 @@ They are used by updateversion.py. -->
<col class="field-name" />
<col class="field-body" />
<tbody valign="top">
-<tr class="field"><th class="field-name">date:</th><td class="field-body">March 28, 2016</td>
+<tr class="field"><th class="field-name">date:</th><td class="field-body">April 01, 2016</td>
</tr>
</tbody>
</table>
@@ -3171,7 +3171,7 @@ following among others:</p>
<div class="footer">
<hr class="footer" />
<a class="reference external" href="generateDS.txt">View document source</a>.
-Generated on: 2016-03-28 18:25 UTC.
+Generated on: 2016-04-01 18:00 UTC.
Generated by <a class="reference external" href="http://docutils.sourceforge.net/">Docutils</a> from <a class="reference external" href="http://docutils.sourceforge.net/rst.html">reStructuredText</a> source.
</div>
diff --git a/generateDS.py b/generateDS.py
index 3d81eb60b9775802b7d37017b93308cc22728bb2..49c5ef21f9b09e36ac7104da89eb2e30fd0fd661 100755
--- a/generateDS.py
+++ b/generateDS.py
@@ -202,7 +202,7 @@ logging.disable(logging.INFO)
# Do not modify the following VERSION comments.
# Used by updateversion.py.
##VERSION##
-VERSION = '2.20b'
+VERSION = '2.21a'
##VERSION##
if sys.version_info.major == 2:
diff --git a/generateDS.txt b/generateDS.txt
index 504406d53e136d95f18ac4e60eae180a5476441f..8add02e764433662836fb50fe3106ae14152608f 100644
--- a/generateDS.txt
+++ b/generateDS.txt
@@ -12,7 +12,7 @@ generateDS -- Generate Data Structures from XML Schema
.. version
-:revision: 2.20b
+:revision: 2.21a
.. version
diff --git a/gui/generateds_gui.py b/gui/generateds_gui.py
index 1e7891317fdccc663a523b5cfc0c6fee3fd07d48..3c0aa94fc65cf78d3471c6c93bff869b688951a7 100755
--- a/gui/generateds_gui.py
+++ b/gui/generateds_gui.py
@@ -41,7 +41,7 @@ from libgenerateDS.gui import generateds_gui_session
# Do not modify the following VERSION comments.
# Used by updateversion.py.
##VERSION##
-VERSION = '2.20b'
+VERSION = '2.21a'
##VERSION##
diff --git a/librarytemplate_howto.html b/librarytemplate_howto.html
index 2bbc82d5573de58fbf769237f7d679111a98d7f4..f89453dcacfac738b506e99f9a4457c22dad75ad 100644
--- a/librarytemplate_howto.html
+++ b/librarytemplate_howto.html
@@ -217,7 +217,7 @@ dkuhlman (at) davekuhlman (dot) org
<col class="field-name" />
<col class="field-body" />
<tbody valign="top">
-<tr class="field"><th class="field-name">revision:</th><td class="field-body">2.20b</td>
+<tr class="field"><th class="field-name">revision:</th><td class="field-body">2.21a</td>
</tr>
</tbody>
</table>
@@ -226,7 +226,7 @@ dkuhlman (at) davekuhlman (dot) org
<col class="field-name" />
<col class="field-body" />
<tbody valign="top">
-<tr class="field"><th class="field-name">date:</th><td class="field-body">March 28, 2016</td>
+<tr class="field"><th class="field-name">date:</th><td class="field-body">April 01, 2016</td>
</tr>
</tbody>
</table>
@@ -380,7 +380,7 @@ this command for your needs. For example, you may need to use
<div class="footer">
<hr class="footer" />
<a class="reference external" href="librarytemplate_howto.txt">View document source</a>.
-Generated on: 2016-03-28 18:25 UTC.
+Generated on: 2016-04-01 18:00 UTC.
Generated by <a class="reference external" href="http://docutils.sourceforge.net/">Docutils</a> from <a class="reference external" href="http://docutils.sourceforge.net/rst.html">reStructuredText</a> source.
</div>
diff --git a/librarytemplate_howto.txt b/librarytemplate_howto.txt
index d90b7677a70fb2d0ce3e833f48b8ac15c7543f69..ffd074b71c4caec0e55050ac1dc384c808b24e6c 100644
--- a/librarytemplate_howto.txt
+++ b/librarytemplate_howto.txt
@@ -8,7 +8,7 @@ How to package a generateDS.py generated library
.. version
-:revision: 2.20b
+:revision: 2.21a
.. version
diff --git a/process_includes.py b/process_includes.py
index 4dcab5a724247a9dc210fe1ff1122dd0757558de..27708999c5bf6b29e0f33e47e6789d4053e75260 100755
--- a/process_includes.py
+++ b/process_includes.py
@@ -40,7 +40,7 @@ except ImportError:
# Do not modify the following VERSION comments.
# Used by updateversion.py.
##VERSION##
-VERSION = '2.20b'
+VERSION = '2.21a'
##VERSION##
CatalogDict = {}
diff --git a/setup.py b/setup.py
index 9a8f42faff03cc93bf4c2de909b9e1e17a579740..ed4dc1d84b7ae6e7d55c9f57a50fea5293470ca3 100644
--- a/setup.py
+++ b/setup.py
@@ -7,7 +7,7 @@ setup(name="generateDS",
# Do not modify the following VERSION comments.
# Used by updateversion.py.
##VERSION##
- version="2.20b",
+ version="2.21a",
##VERSION##
author="Dave Kuhlman",
author_email="dkuhlman@davekuhlman.org",
diff --git a/tutorial/generateds_tutorial.html b/tutorial/generateds_tutorial.html
index daffbe1e6bee98a624428edf2e8141288efc1a75..b390c1ec12b59b817febfd8338a6c6d92a2ba3fc 100644
--- a/tutorial/generateds_tutorial.html
+++ b/tutorial/generateds_tutorial.html
@@ -219,7 +219,7 @@ They are used by updateversion.py. -->
<col class="field-name" />
<col class="field-body" />
<tbody valign="top">
-<tr class="field"><th class="field-name">revision:</th><td class="field-body">2.20b</td>
+<tr class="field"><th class="field-name">revision:</th><td class="field-body">2.21a</td>
</tr>
</tbody>
</table>
@@ -228,7 +228,7 @@ They are used by updateversion.py. -->
<col class="field-name" />
<col class="field-body" />
<tbody valign="top">
-<tr class="field"><th class="field-name">date:</th><td class="field-body">March 28, 2016</td>
+<tr class="field"><th class="field-name">date:</th><td class="field-body">April 01, 2016</td>
</tr>
</tbody>
</table>
@@ -1210,7 +1210,7 @@ named <tt class="docutils literal">garden_api.py</tt>, you can create an instanc
<div class="footer">
<hr class="footer" />
<a class="reference external" href="generateds_tutorial.txt">View document source</a>.
-Generated on: 2016-03-28 18:25 UTC.
+Generated on: 2016-04-01 18:00 UTC.
Generated by <a class="reference external" href="http://docutils.sourceforge.net/">Docutils</a> from <a class="reference external" href="http://docutils.sourceforge.net/rst.html">reStructuredText</a> source.
</div>
diff --git a/tutorial/generateds_tutorial.txt b/tutorial/generateds_tutorial.txt
index 291674e4395fcd8a5d896d0999746ba5b94b05e8..d526c01ee60ab0e6d7b276b43ced5b6ec9f0cbae 100644
--- a/tutorial/generateds_tutorial.txt
+++ b/tutorial/generateds_tutorial.txt
@@ -11,7 +11,7 @@ generateDS -- Introduction and Tutorial
.. version
-:revision: 2.20b
+:revision: 2.21a
.. version
diff --git a/tutorial/generateds_tutorial.zip b/tutorial/generateds_tutorial.zip
index 46a5c5d8e8421887428115def7fe27484ec50054..233f9d6a7c04b4859b0250516e4adac39f2de367 100644
Binary files a/tutorial/generateds_tutorial.zip and b/tutorial/generateds_tutorial.zip differ