diff --git a/RELEASE-NOTES.adoc b/RELEASE-NOTES.adoc
index ccd319330..b27b54948 100644
--- a/RELEASE-NOTES.adoc
+++ b/RELEASE-NOTES.adoc
@@ -1,5 +1,13 @@
 = picocli Release Notes
 
+== 0.9.4 - Bugfix release for public review. API may change.
+
+* #114 Replace ISO-8613-3 "true colors" with more widely supported 256-color palette (enhancement)
+* #113 Fix javadoc warnings (doc enhancement)
+* #117 The build should work for anyone checking out the project (bug)
+* #112 Improve (shorten) user manual (doc enhancement)
+* #105 Automate publishing to JCentral & Maven Central
+
 == 0.9.3 - Bugfix release for public review. API may change.
 
 * #90 Automate release
diff --git a/build.gradle b/build.gradle
index cc19b34c6..498150862 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,11 +1,11 @@
 group 'info.picocli'
 description 'Java command line parser and colorized usage help generator. In a single file, to be included in source form, so users can run picocli-based applications without requiring picocli as an external dependency. Generates easily customizable usage help messages with ANSI styles and colors.'
-version '0.9.4-SNAPSHOT'
+version '0.9.4'
 
 // for bumpVersion task
-def oldVersion = '0\\.9\\.3'
+def oldVersion = '0\\.9\\.4-SNAPSHOT'
 def oldRevdate = '2017\\-04\\-30'
-def revDate    = '2017-04-23'
+def revDate    = '2017-05-04'
 
 buildscript {
     repositories {
diff --git a/docs/apidocs/allclasses-frame.html b/docs/apidocs/allclasses-frame.html
index 0ac034736..419ad55f0 100644
--- a/docs/apidocs/allclasses-frame.html
+++ b/docs/apidocs/allclasses-frame.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_131) on Sun Apr 23 15:37:34 JST 2017 -->
-<title>All Classes (picocli 0.9.3 API)</title>
-<meta name="date" content="2017-04-23">
+<!-- Generated by javadoc (1.8.0_131) on Thu May 04 10:49:40 JST 2017 -->
+<title>All Classes (picocli 0.9.4 API)</title>
+<meta name="date" content="2017-05-04">
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
 <script type="text/javascript" src="script.js"></script>
 </head>
diff --git a/docs/apidocs/allclasses-noframe.html b/docs/apidocs/allclasses-noframe.html
index 2990b1013..e82f89c49 100644
--- a/docs/apidocs/allclasses-noframe.html
+++ b/docs/apidocs/allclasses-noframe.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_131) on Sun Apr 23 15:37:34 JST 2017 -->
-<title>All Classes (picocli 0.9.3 API)</title>
-<meta name="date" content="2017-04-23">
+<!-- Generated by javadoc (1.8.0_131) on Thu May 04 10:49:40 JST 2017 -->
+<title>All Classes (picocli 0.9.4 API)</title>
+<meta name="date" content="2017-05-04">
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
 <script type="text/javascript" src="script.js"></script>
 </head>
diff --git a/docs/apidocs/constant-values.html b/docs/apidocs/constant-values.html
index 11ed44f9f..6f29a6d51 100644
--- a/docs/apidocs/constant-values.html
+++ b/docs/apidocs/constant-values.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_131) on Sun Apr 23 15:37:34 JST 2017 -->
-<title>Constant Field Values (picocli 0.9.3 API)</title>
-<meta name="date" content="2017-04-23">
+<!-- Generated by javadoc (1.8.0_131) on Thu May 04 10:49:39 JST 2017 -->
+<title>Constant Field Values (picocli 0.9.4 API)</title>
+<meta name="date" content="2017-05-04">
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
 <script type="text/javascript" src="script.js"></script>
 </head>
@@ -12,7 +12,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Constant Field Values (picocli 0.9.3 API)";
+            parent.document.title="Constant Field Values (picocli 0.9.4 API)";
         }
     }
     catch(err) {
@@ -93,7 +93,7 @@ <h2 title="picocli">picocli.*</h2>
 <!--   -->
 </a><code>public&nbsp;static&nbsp;final&nbsp;java.lang.String</code></td>
 <td><code><a href="picocli/CommandLine.html#VERSION">VERSION</a></code></td>
-<td class="colLast"><code>"0.9.3"</code></td>
+<td class="colLast"><code>"0.9.4"</code></td>
 </tr>
 </tbody>
 </table>
diff --git a/docs/apidocs/deprecated-list.html b/docs/apidocs/deprecated-list.html
index 6734c1235..bc95ffc78 100644
--- a/docs/apidocs/deprecated-list.html
+++ b/docs/apidocs/deprecated-list.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_131) on Sun Apr 23 15:37:34 JST 2017 -->
-<title>Deprecated List (picocli 0.9.3 API)</title>
-<meta name="date" content="2017-04-23">
+<!-- Generated by javadoc (1.8.0_131) on Thu May 04 10:49:40 JST 2017 -->
+<title>Deprecated List (picocli 0.9.4 API)</title>
+<meta name="date" content="2017-05-04">
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
 <script type="text/javascript" src="script.js"></script>
 </head>
@@ -12,7 +12,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Deprecated List (picocli 0.9.3 API)";
+            parent.document.title="Deprecated List (picocli 0.9.4 API)";
         }
     }
     catch(err) {
diff --git a/docs/apidocs/help-doc.html b/docs/apidocs/help-doc.html
index 722e9aeec..2241a45a8 100644
--- a/docs/apidocs/help-doc.html
+++ b/docs/apidocs/help-doc.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_131) on Sun Apr 23 15:37:34 JST 2017 -->
-<title>API Help (picocli 0.9.3 API)</title>
-<meta name="date" content="2017-04-23">
+<!-- Generated by javadoc (1.8.0_131) on Thu May 04 10:49:40 JST 2017 -->
+<title>API Help (picocli 0.9.4 API)</title>
+<meta name="date" content="2017-05-04">
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
 <script type="text/javascript" src="script.js"></script>
 </head>
@@ -12,7 +12,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="API Help (picocli 0.9.3 API)";
+            parent.document.title="API Help (picocli 0.9.4 API)";
         }
     }
     catch(err) {
diff --git a/docs/apidocs/index-all.html b/docs/apidocs/index-all.html
index 5c762ee56..12efeb5be 100644
--- a/docs/apidocs/index-all.html
+++ b/docs/apidocs/index-all.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_131) on Sun Apr 23 15:37:34 JST 2017 -->
-<title>Index (picocli 0.9.3 API)</title>
-<meta name="date" content="2017-04-23">
+<!-- Generated by javadoc (1.8.0_131) on Thu May 04 10:49:39 JST 2017 -->
+<title>Index (picocli 0.9.4 API)</title>
+<meta name="date" content="2017-05-04">
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
 <script type="text/javascript" src="script.js"></script>
 </head>
@@ -12,7 +12,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Index (picocli 0.9.3 API)";
+            parent.document.title="Index (picocli 0.9.4 API)";
         }
     }
     catch(err) {
@@ -100,7 +100,7 @@ <h2 class="title">A</h2>
 <dt><span class="memberNameLink"><a href="picocli/CommandLine.Help.Layout.html#addOption-java.lang.reflect.Field-picocli.CommandLine.Help.IParamLabelRenderer-">addOption(Field, CommandLine.Help.IParamLabelRenderer)</a></span> - Method in class picocli.<a href="picocli/CommandLine.Help.Layout.html" title="class in picocli">CommandLine.Help.Layout</a></dt>
 <dd>
 <div class="block">Delegates to the <a href="picocli/CommandLine.Help.Layout.html#optionRenderer"><code>option renderer</code></a> of this layout to obtain
- text values for the specified <a href="picocli/CommandLine.Option.html" title="annotation in picocli"><code>CommandLine.Option</code></a>, and then calls the <code>#layout(Field, Text[][])</code>
+ text values for the specified <a href="picocli/CommandLine.Option.html" title="annotation in picocli"><code>CommandLine.Option</code></a>, and then calls the <a href="picocli/CommandLine.Help.Layout.html#layout-java.lang.reflect.Field-picocli.CommandLine.Help.Ansi.Text:A:A-"><code>CommandLine.Help.Layout.layout(Field, CommandLine.Help.Ansi.Text[][])</code></a>
  method to write these text values into the correct cells in the TextTable.</div>
 </dd>
 <dt><span class="memberNameLink"><a href="picocli/CommandLine.Help.Layout.html#addOptions-java.util.List-picocli.CommandLine.Help.IParamLabelRenderer-">addOptions(List&lt;Field&gt;, CommandLine.Help.IParamLabelRenderer)</a></span> - Method in class picocli.<a href="picocli/CommandLine.Help.Layout.html" title="class in picocli">CommandLine.Help.Layout</a></dt>
@@ -111,7 +111,7 @@ <h2 class="title">A</h2>
 <dd>
 <div class="block">Delegates to the <a href="picocli/CommandLine.Help.Layout.html#parameterRenderer"><code>parameter renderer</code></a> of this layout
  to obtain text values for the specified <a href="picocli/CommandLine.Parameters.html" title="annotation in picocli"><code>CommandLine.Parameters</code></a>, and then calls
- <code>#layout(Field, Text[][])</code> to write these text values into the correct cells in the TextTable.</div>
+ <a href="picocli/CommandLine.Help.Layout.html#layout-java.lang.reflect.Field-picocli.CommandLine.Help.Ansi.Text:A:A-"><code>CommandLine.Help.Layout.layout(Field, CommandLine.Help.Ansi.Text[][])</code></a> to write these text values into the correct cells in the TextTable.</div>
 </dd>
 <dt><span class="memberNameLink"><a href="picocli/CommandLine.Help.Layout.html#addPositionalParameters-java.util.List-picocli.CommandLine.Help.IParamLabelRenderer-">addPositionalParameters(List&lt;Field&gt;, CommandLine.Help.IParamLabelRenderer)</a></span> - Method in class picocli.<a href="picocli/CommandLine.Help.Layout.html" title="class in picocli">CommandLine.Help.Layout</a></dt>
 <dd>
@@ -119,11 +119,11 @@ <h2 class="title">A</h2>
 </dd>
 <dt><span class="memberNameLink"><a href="picocli/CommandLine.Help.TextTable.html#addRowValues-java.lang.String...-">addRowValues(String...)</a></span> - Method in class picocli.<a href="picocli/CommandLine.Help.TextTable.html" title="class in picocli">CommandLine.Help.TextTable</a></dt>
 <dd>
-<div class="block">Delegates to <code>#addRowValues(Text...)</code>.</div>
+<div class="block">Delegates to <a href="picocli/CommandLine.Help.TextTable.html#addRowValues-picocli.CommandLine.Help.Ansi.Text...-"><code>CommandLine.Help.TextTable.addRowValues(CommandLine.Help.Ansi.Text...)</code></a>.</div>
 </dd>
 <dt><span class="memberNameLink"><a href="picocli/CommandLine.Help.TextTable.html#addRowValues-picocli.CommandLine.Help.Ansi.Text...-">addRowValues(CommandLine.Help.Ansi.Text...)</a></span> - Method in class picocli.<a href="picocli/CommandLine.Help.TextTable.html" title="class in picocli">CommandLine.Help.TextTable</a></dt>
 <dd>
-<div class="block">Adds a new <a href="picocli/CommandLine.Help.TextTable.html#addEmptyRow--">empty row</a>, then calls <code>putValue</code> for each of the specified values, adding more empty rows
+<div class="block">Adds a new <a href="picocli/CommandLine.Help.TextTable.html#addEmptyRow--">empty row</a>, then calls <a href="picocli/CommandLine.Help.TextTable.html#putValue-int-int-picocli.CommandLine.Help.Ansi.Text-"><code>putValue</code></a> for each of the specified values, adding more empty rows
  if the return value indicates that the value spanned multiple columns or was wrapped to multiple rows.</div>
 </dd>
 <dt><span class="memberNameLink"><a href="picocli/CommandLine.html#ansi">ansi</a></span> - Static variable in class picocli.<a href="picocli/CommandLine.html" title="class in picocli">CommandLine</a></dt>
@@ -170,7 +170,7 @@ <h2 class="title">C</h2>
 <dl>
 <dt><span class="memberNameLink"><a href="picocli/CommandLine.Help.TextTable.html#cellAt-int-int-">cellAt(int, int)</a></span> - Method in class picocli.<a href="picocli/CommandLine.Help.TextTable.html" title="class in picocli">CommandLine.Help.TextTable</a></dt>
 <dd>
-<div class="block">Returns the <code>char[]</code> slot at the specified row and column to write a text value into.</div>
+<div class="block">Returns the <code>Text</code> slot at the specified row and column to write a text value into.</div>
 </dd>
 <dt><span class="memberNameLink"><a href="picocli/CommandLine.Help.Ansi.Text.html#clone--">clone()</a></span> - Method in class picocli.<a href="picocli/CommandLine.Help.Ansi.Text.html" title="class in picocli">CommandLine.Help.Ansi.Text</a></dt>
 <dd>&nbsp;</dd>
@@ -326,7 +326,7 @@ <h2 class="title">C</h2>
 </dd>
 <dt><span class="memberNameLink"><a href="picocli/CommandLine.Help.ColorScheme.html#commands-picocli.CommandLine.Help.Ansi.IStyle...-">commands(CommandLine.Help.Ansi.IStyle...)</a></span> - Method in class picocli.<a href="picocli/CommandLine.Help.ColorScheme.html" title="class in picocli">CommandLine.Help.ColorScheme</a></dt>
 <dd>
-<div class="block">Adds the specified styles to the styles for commands in this color scheme and returns this color scheme.</div>
+<div class="block">Adds the specified styles to the registered styles for commands in this color scheme and returns this color scheme.</div>
 </dd>
 <dt><span class="memberNameLink"><a href="picocli/CommandLine.Help.ColorScheme.html#commandStyles">commandStyles</a></span> - Variable in class picocli.<a href="picocli/CommandLine.Help.ColorScheme.html" title="class in picocli">CommandLine.Help.ColorScheme</a></dt>
 <dd>&nbsp;</dd>
@@ -494,11 +494,11 @@ <h2 class="title">G</h2>
 <dl>
 <dt><span class="memberNameLink"><a href="picocli/CommandLine.html#getCommands--">getCommands()</a></span> - Method in class picocli.<a href="picocli/CommandLine.html" title="class in picocli">CommandLine</a></dt>
 <dd>
-<div class="block">Returns a map with the registered sub-commands.</div>
+<div class="block">Returns a map with the <a href="picocli/CommandLine.html#addCommand-java.lang.String-java.lang.Object-">registered</a> sub-commands.</div>
 </dd>
 <dt><span class="memberNameLink"><a href="picocli/CommandLine.html#getSeparator--">getSeparator()</a></span> - Method in class picocli.<a href="picocli/CommandLine.html" title="class in picocli">CommandLine</a></dt>
 <dd>
-<div class="block">Returns the String that separates option names from option values.</div>
+<div class="block">Returns the String that separates option names from option values when parsing command line options.</div>
 </dd>
 <dt><span class="memberNameLink"><a href="picocli/CommandLine.Help.Ansi.Text.html#getStyledChars-int-int-picocli.CommandLine.Help.Ansi.Text-int-">getStyledChars(int, int, CommandLine.Help.Ansi.Text, int)</a></span> - Method in class picocli.<a href="picocli/CommandLine.Help.Ansi.Text.html" title="class in picocli">CommandLine.Help.Ansi.Text</a></dt>
 <dd>
@@ -564,7 +564,7 @@ <h2 class="title">J</h2>
 <dl>
 <dt><span class="memberNameLink"><a href="picocli/CommandLine.Help.html#join-java.lang.String:A-java.lang.StringBuilder-java.lang.Object...-">join(String[], StringBuilder, Object...)</a></span> - Static method in class picocli.<a href="picocli/CommandLine.Help.html" title="class in picocli">CommandLine.Help</a></dt>
 <dd>
-<div class="block">Appends each of the specified values plus the specified separator to the specified StringBuilder and returns it.</div>
+<div class="block">Formats each of the specified values and appends it to the specified StringBuilder.</div>
 </dd>
 </dl>
 <a name="I:L">
@@ -662,7 +662,7 @@ <h2 class="title">O</h2>
 </dd>
 <dt><span class="memberNameLink"><a href="picocli/CommandLine.Help.ColorScheme.html#optionParams-picocli.CommandLine.Help.Ansi.IStyle...-">optionParams(CommandLine.Help.Ansi.IStyle...)</a></span> - Method in class picocli.<a href="picocli/CommandLine.Help.ColorScheme.html" title="class in picocli">CommandLine.Help.ColorScheme</a></dt>
 <dd>
-<div class="block">Adds the specified styles to the styles for option parameters in this color scheme and returns this color scheme.</div>
+<div class="block">Adds the specified styles to the registered styles for option parameters in this color scheme and returns this color scheme.</div>
 </dd>
 <dt><span class="memberNameLink"><a href="picocli/CommandLine.Help.ColorScheme.html#optionParamStyles">optionParamStyles</a></span> - Variable in class picocli.<a href="picocli/CommandLine.Help.ColorScheme.html" title="class in picocli">CommandLine.Help.ColorScheme</a></dt>
 <dd>&nbsp;</dd>
@@ -674,7 +674,7 @@ <h2 class="title">O</h2>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="picocli/CommandLine.Help.ColorScheme.html#options-picocli.CommandLine.Help.Ansi.IStyle...-">options(CommandLine.Help.Ansi.IStyle...)</a></span> - Method in class picocli.<a href="picocli/CommandLine.Help.ColorScheme.html" title="class in picocli">CommandLine.Help.ColorScheme</a></dt>
 <dd>
-<div class="block">Adds the specified styles to the styles for options in this color scheme and returns this color scheme.</div>
+<div class="block">Adds the specified styles to the registered styles for options in this color scheme and returns this color scheme.</div>
 </dd>
 <dt><span class="memberNameLink"><a href="picocli/CommandLine.Help.ColorScheme.html#optionStyles">optionStyles</a></span> - Variable in class picocli.<a href="picocli/CommandLine.Help.ColorScheme.html" title="class in picocli">CommandLine.Help.ColorScheme</a></dt>
 <dd>&nbsp;</dd>
@@ -721,7 +721,7 @@ <h2 class="title">P</h2>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="picocli/CommandLine.Help.ColorScheme.html#parameters-picocli.CommandLine.Help.Ansi.IStyle...-">parameters(CommandLine.Help.Ansi.IStyle...)</a></span> - Method in class picocli.<a href="picocli/CommandLine.Help.ColorScheme.html" title="class in picocli">CommandLine.Help.ColorScheme</a></dt>
 <dd>
-<div class="block">Adds the specified styles to the styles for positional parameters in this color scheme and returns this color scheme.</div>
+<div class="block">Adds the specified styles to the registered styles for positional parameters in this color scheme and returns this color scheme.</div>
 </dd>
 <dt><span class="memberNameLink"><a href="picocli/CommandLine.Help.ColorScheme.html#parameterStyles">parameterStyles</a></span> - Variable in class picocli.<a href="picocli/CommandLine.Help.ColorScheme.html" title="class in picocli">CommandLine.Help.ColorScheme</a></dt>
 <dd>&nbsp;</dd>
@@ -750,7 +750,7 @@ <h2 class="title">P</h2>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="picocli/CommandLine.Help.Ansi.Text.html#plainString--">plainString()</a></span> - Method in class picocli.<a href="picocli/CommandLine.Help.Ansi.Text.html" title="class in picocli">CommandLine.Help.Ansi.Text</a></dt>
 <dd>
-<div class="block">Returns the plain text without any formatting</div>
+<div class="block">Returns the plain text without any formatting.</div>
 </dd>
 <dt><span class="memberNameLink"><a href="picocli/CommandLine.Help.html#positionalParametersFields">positionalParametersFields</a></span> - Variable in class picocli.<a href="picocli/CommandLine.Help.html" title="class in picocli">CommandLine.Help</a></dt>
 <dd>
@@ -804,7 +804,7 @@ <h2 class="title">S</h2>
 <dl>
 <dt><span class="memberNameLink"><a href="picocli/CommandLine.Help.IParamLabelRenderer.html#separator--">separator()</a></span> - Method in interface picocli.<a href="picocli/CommandLine.Help.IParamLabelRenderer.html" title="interface in picocli">CommandLine.Help.IParamLabelRenderer</a></dt>
 <dd>
-<div class="block">Returns the separator between option name and param label</div>
+<div class="block">Returns the separator between option name and param label.</div>
 </dd>
 <dt><span class="memberNameLink"><a href="picocli/CommandLine.Help.html#separator">separator</a></span> - Variable in class picocli.<a href="picocli/CommandLine.Help.html" title="class in picocli">CommandLine.Help</a></dt>
 <dd>
@@ -812,7 +812,7 @@ <h2 class="title">S</h2>
 </dd>
 <dt><span class="memberNameLink"><a href="picocli/CommandLine.html#setSeparator-java.lang.String-">setSeparator(String)</a></span> - Method in class picocli.<a href="picocli/CommandLine.html" title="class in picocli">CommandLine</a></dt>
 <dd>
-<div class="block">Sets the String that separates option names from option values to the specified value.</div>
+<div class="block">Sets the String the parser uses to separate option names from option values to the specified value.</div>
 </dd>
 <dt><span class="memberNameLink"><a href="picocli/CommandLine.Help.html#shortestFirst--">shortestFirst()</a></span> - Static method in class picocli.<a href="picocli/CommandLine.Help.html" title="class in picocli">CommandLine.Help</a></dt>
 <dd>
@@ -952,7 +952,7 @@ <h2 class="title">V</h2>
 </dd>
 <dt><span class="memberNameLink"><a href="picocli/CommandLine.html#VERSION">VERSION</a></span> - Static variable in class picocli.<a href="picocli/CommandLine.html" title="class in picocli">CommandLine</a></dt>
 <dd>
-<div class="block">This is picocli version "0.9.3".</div>
+<div class="block">This is picocli version "0.9.4".</div>
 </dd>
 </dl>
 <a name="I:W">
diff --git a/docs/apidocs/index.html b/docs/apidocs/index.html
index f17365aec..587fc8eb0 100644
--- a/docs/apidocs/index.html
+++ b/docs/apidocs/index.html
@@ -2,8 +2,8 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_131) on Sun Apr 23 15:37:34 JST 2017 -->
-<title>picocli 0.9.3 API</title>
+<!-- Generated by javadoc (1.8.0_131) on Thu May 04 10:49:40 JST 2017 -->
+<title>picocli 0.9.4 API</title>
 <script type="text/javascript">
     tmpTargetPage = "" + window.location.search;
     if (tmpTargetPage != "" && tmpTargetPage != "undefined")
diff --git a/docs/apidocs/overview-tree.html b/docs/apidocs/overview-tree.html
index 3fc520969..a71878e12 100644
--- a/docs/apidocs/overview-tree.html
+++ b/docs/apidocs/overview-tree.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_131) on Sun Apr 23 15:37:34 JST 2017 -->
-<title>Class Hierarchy (picocli 0.9.3 API)</title>
-<meta name="date" content="2017-04-23">
+<!-- Generated by javadoc (1.8.0_131) on Thu May 04 10:49:39 JST 2017 -->
+<title>Class Hierarchy (picocli 0.9.4 API)</title>
+<meta name="date" content="2017-05-04">
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
 <script type="text/javascript" src="script.js"></script>
 </head>
@@ -12,7 +12,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Class Hierarchy (picocli 0.9.3 API)";
+            parent.document.title="Class Hierarchy (picocli 0.9.4 API)";
         }
     }
     catch(err) {
diff --git a/docs/apidocs/picocli/CommandLine.Arity.html b/docs/apidocs/picocli/CommandLine.Arity.html
index b06f8cfc6..04c29ae12 100644
--- a/docs/apidocs/picocli/CommandLine.Arity.html
+++ b/docs/apidocs/picocli/CommandLine.Arity.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_131) on Sun Apr 23 15:37:33 JST 2017 -->
-<title>CommandLine.Arity (picocli 0.9.3 API)</title>
-<meta name="date" content="2017-04-23">
+<!-- Generated by javadoc (1.8.0_131) on Thu May 04 10:49:38 JST 2017 -->
+<title>CommandLine.Arity (picocli 0.9.4 API)</title>
+<meta name="date" content="2017-05-04">
 <link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
 <script type="text/javascript" src="../script.js"></script>
 </head>
@@ -12,7 +12,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="CommandLine.Arity (picocli 0.9.3 API)";
+            parent.document.title="CommandLine.Arity (picocli 0.9.4 API)";
         }
     }
     catch(err) {
@@ -323,6 +323,12 @@ <h4>forOption</h4>
 <pre>public static&nbsp;<a href="../picocli/CommandLine.Arity.html" title="class in picocli">CommandLine.Arity</a>&nbsp;forOption(java.lang.reflect.Field&nbsp;field)</pre>
 <div class="block">Returns a new <code>Arity</code> based on the Option annotation on the specified field, or the field type if no
  arity was specified.</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>field</code> - the field whose Option annotation to inspect</dd>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd>a new <code>Arity</code> based on the Option annotation on the specified field</dd>
+</dl>
 </li>
 </ul>
 <a name="forParameters-java.lang.reflect.Field-">
@@ -334,6 +340,12 @@ <h4>forParameters</h4>
 <pre>public static&nbsp;<a href="../picocli/CommandLine.Arity.html" title="class in picocli">CommandLine.Arity</a>&nbsp;forParameters(java.lang.reflect.Field&nbsp;field)</pre>
 <div class="block">Returns a new <code>Arity</code> based on the Parameters annotation on the specified field, or the field type
  if no arity was specified.</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>field</code> - the field whose Parameters annotation to inspect</dd>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd>a new <code>Arity</code> based on the Parameters annotation on the specified field</dd>
+</dl>
 </li>
 </ul>
 <a name="forType-java.lang.Class-">
@@ -345,6 +357,12 @@ <h4>forType</h4>
 <pre>public static&nbsp;<a href="../picocli/CommandLine.Arity.html" title="class in picocli">CommandLine.Arity</a>&nbsp;forType(java.lang.Class&lt;?&gt;&nbsp;type)</pre>
 <div class="block">Returns a new <code>Arity</code> based on the specified type: booleans have arity 0, arrays or Collections have
  arity "0..*", and other types have arity 1.</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>type</code> - the type whose default arity to return</dd>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd>a new <code>Arity</code> based on the specified type</dd>
+</dl>
 </li>
 </ul>
 <a name="valueOf-java.lang.String-">
@@ -358,6 +376,12 @@ <h4>valueOf</h4>
  be a fixed integer value or a range of the form <code>MIN_VALUE + ".." + MAX_VALUE</code>. If the
  <code>MIN_VALUE</code> string is not numeric, the minimum is zero. If the <code>MAX_VALUE</code> is not numeric, the
  arity is taken to be variable and the maximum is <code>Integer.MAX_VALUE</code>.</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>arity</code> - the arity string to parse</dd>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd>a new <code>Arity</code> value</dd>
+</dl>
 </li>
 </ul>
 <a name="equals-java.lang.Object-">
diff --git a/docs/apidocs/picocli/CommandLine.Command.html b/docs/apidocs/picocli/CommandLine.Command.html
index 00f4b9048..5ec4a079b 100644
--- a/docs/apidocs/picocli/CommandLine.Command.html
+++ b/docs/apidocs/picocli/CommandLine.Command.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_131) on Sun Apr 23 15:37:33 JST 2017 -->
-<title>CommandLine.Command (picocli 0.9.3 API)</title>
-<meta name="date" content="2017-04-23">
+<!-- Generated by javadoc (1.8.0_131) on Thu May 04 10:49:38 JST 2017 -->
+<title>CommandLine.Command (picocli 0.9.4 API)</title>
+<meta name="date" content="2017-05-04">
 <link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
 <script type="text/javascript" src="../script.js"></script>
 </head>
@@ -12,7 +12,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="CommandLine.Command (picocli 0.9.3 API)";
+            parent.document.title="CommandLine.Command (picocli 0.9.4 API)";
         }
     }
     catch(err) {
@@ -262,6 +262,8 @@ <h4>name</h4>
 <pre>public abstract&nbsp;java.lang.String&nbsp;name</pre>
 <div class="block">Program name to show in the synopsis. If omitted, <code>"&lt;main class&gt;"</code> is used.</div>
 <dl>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd>the program name to show in the synopsis</dd>
 <dt><span class="seeLabel">See Also:</span></dt>
 <dd><a href="../picocli/CommandLine.Help.html#commandName"><code>CommandLine.Help.commandName</code></a></dd>
 </dl>
@@ -283,8 +285,11 @@ <h4>separator</h4>
 <pre>public abstract&nbsp;java.lang.String&nbsp;separator</pre>
 <div class="block">String that separates options from option parameters. Default is <code>"="</code>. Spaces are also accepted.</div>
 <dl>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd>the string that separates options from option parameters, used both when parsing and when generating usage help</dd>
 <dt><span class="seeLabel">See Also:</span></dt>
-<dd><a href="../picocli/CommandLine.Help.html#separator"><code>CommandLine.Help.separator</code></a></dd>
+<dd><a href="../picocli/CommandLine.Help.html#separator"><code>CommandLine.Help.separator</code></a>, 
+<a href="../picocli/CommandLine.html#setSeparator-java.lang.String-"><code>CommandLine.setSeparator(String)</code></a></dd>
 </dl>
 <dl>
 <dt>Default:</dt>
@@ -304,6 +309,8 @@ <h4>headerHeading</h4>
 <pre>public abstract&nbsp;java.lang.String&nbsp;headerHeading</pre>
 <div class="block">Set the heading preceding the header section. May contain embedded format specifiers.</div>
 <dl>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd>the heading preceding the header section</dd>
 <dt><span class="seeLabel">See Also:</span></dt>
 <dd><a href="../picocli/CommandLine.Help.html#headerHeading-java.lang.Object...-"><code>CommandLine.Help.headerHeading(Object...)</code></a></dd>
 </dl>
@@ -325,6 +332,8 @@ <h4>header</h4>
 <pre>public abstract&nbsp;java.lang.String[]&nbsp;header</pre>
 <div class="block">Optional summary description of the command, shown before the synopsis.</div>
 <dl>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd>summary description of the command</dd>
 <dt><span class="seeLabel">See Also:</span></dt>
 <dd><a href="../picocli/CommandLine.Help.html#header"><code>CommandLine.Help.header</code></a>, 
 <a href="../picocli/CommandLine.Help.html#header-java.lang.Object...-"><code>CommandLine.Help.header(Object...)</code></a></dd>
@@ -349,6 +358,8 @@ <h4>synopsisHeading</h4>
  format specifiers. The default heading is <code>"Usage: "</code> (without a line
  break between the heading and the synopsis text).</div>
 <dl>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd>the heading preceding the synopsis text</dd>
 <dt><span class="seeLabel">See Also:</span></dt>
 <dd><a href="../picocli/CommandLine.Help.html#synopsisHeading-java.lang.Object...-"><code>CommandLine.Help.synopsisHeading(Object...)</code></a></dd>
 </dl>
@@ -371,6 +382,8 @@ <h4>abbreviateSynopsis</h4>
 <div class="block">Specify <code>true</code> to generate an abbreviated synopsis like <code>"&lt;main&gt; [OPTIONS] [PARAMETERS...]"</code>.
  By default, a detailed synopsis with individual option names and parameters is generated.</div>
 <dl>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd>whether the synopsis should be abbreviated</dd>
 <dt><span class="seeLabel">See Also:</span></dt>
 <dd><a href="../picocli/CommandLine.Help.html#abbreviateSynopsis"><code>CommandLine.Help.abbreviateSynopsis</code></a>, 
 <a href="../picocli/CommandLine.Help.html#abbreviatedSynopsis--"><code>CommandLine.Help.abbreviatedSynopsis()</code></a>, 
@@ -394,6 +407,8 @@ <h4>customSynopsis</h4>
 <pre>public abstract&nbsp;java.lang.String[]&nbsp;customSynopsis</pre>
 <div class="block">Specify one or more custom synopsis lines to display instead of an auto-generated synopsis.</div>
 <dl>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd>custom synopsis text to replace the auto-generated synopsis</dd>
 <dt><span class="seeLabel">See Also:</span></dt>
 <dd><a href="../picocli/CommandLine.Help.html#customSynopsis"><code>CommandLine.Help.customSynopsis</code></a>, 
 <a href="../picocli/CommandLine.Help.html#customSynopsis-java.lang.Object...-"><code>CommandLine.Help.customSynopsis(Object...)</code></a></dd>
@@ -416,6 +431,8 @@ <h4>descriptionHeading</h4>
 <pre>public abstract&nbsp;java.lang.String&nbsp;descriptionHeading</pre>
 <div class="block">Set the heading preceding the description section. May contain embedded format specifiers.</div>
 <dl>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd>the heading preceding the description section</dd>
 <dt><span class="seeLabel">See Also:</span></dt>
 <dd><a href="../picocli/CommandLine.Help.html#descriptionHeading-java.lang.Object...-"><code>CommandLine.Help.descriptionHeading(Object...)</code></a></dd>
 </dl>
@@ -437,6 +454,8 @@ <h4>description</h4>
 <pre>public abstract&nbsp;java.lang.String[]&nbsp;description</pre>
 <div class="block">Optional text to display between the synopsis line(s) and the list of options.</div>
 <dl>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd>description of this command</dd>
 <dt><span class="seeLabel">See Also:</span></dt>
 <dd><a href="../picocli/CommandLine.Help.html#description"><code>CommandLine.Help.description</code></a>, 
 <a href="../picocli/CommandLine.Help.html#description-java.lang.Object...-"><code>CommandLine.Help.description(Object...)</code></a></dd>
@@ -459,6 +478,8 @@ <h4>parameterListHeading</h4>
 <pre>public abstract&nbsp;java.lang.String&nbsp;parameterListHeading</pre>
 <div class="block">Set the heading preceding the parameters list. May contain embedded format specifiers.</div>
 <dl>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd>the heading preceding the parameters list</dd>
 <dt><span class="seeLabel">See Also:</span></dt>
 <dd><a href="../picocli/CommandLine.Help.html#parameterListHeading-java.lang.Object...-"><code>CommandLine.Help.parameterListHeading(Object...)</code></a></dd>
 </dl>
@@ -480,6 +501,8 @@ <h4>optionListHeading</h4>
 <pre>public abstract&nbsp;java.lang.String&nbsp;optionListHeading</pre>
 <div class="block">Set the heading preceding the options list. May contain embedded format specifiers.</div>
 <dl>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd>the heading preceding the options list</dd>
 <dt><span class="seeLabel">See Also:</span></dt>
 <dd><a href="../picocli/CommandLine.Help.html#optionListHeading-java.lang.Object...-"><code>CommandLine.Help.optionListHeading(Object...)</code></a></dd>
 </dl>
@@ -501,6 +524,8 @@ <h4>sortOptions</h4>
 <pre>public abstract&nbsp;boolean&nbsp;sortOptions</pre>
 <div class="block">Specify <code>false</code> to show Options in declaration order. The default is to sort alphabetically.</div>
 <dl>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd>whether options should be shown in alphabetic order.</dd>
 <dt><span class="seeLabel">See Also:</span></dt>
 <dd><a href="../picocli/CommandLine.Help.html#sortOptions"><code>CommandLine.Help.sortOptions</code></a></dd>
 </dl>
@@ -523,6 +548,8 @@ <h4>requiredOptionMarker</h4>
 <div class="block">Prefix required options with this character in the options list. The default is no marker: the synopsis
  indicates which options and parameters are required.</div>
 <dl>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd>the character to show in the options list to mark required options</dd>
 <dt><span class="seeLabel">See Also:</span></dt>
 <dd><a href="../picocli/CommandLine.Help.html#requiredOptionMarker"><code>CommandLine.Help.requiredOptionMarker</code></a></dd>
 </dl>
@@ -545,6 +572,8 @@ <h4>showDefaultValues</h4>
 <div class="block">Specify <code>true</code> to show default values in the description column of the options list (except for
  boolean options). False by default.</div>
 <dl>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd>whether the default values for options and parameters should be shown in the description column</dd>
 <dt><span class="seeLabel">See Also:</span></dt>
 <dd><a href="../picocli/CommandLine.Help.html#showDefaultValues"><code>CommandLine.Help.showDefaultValues</code></a></dd>
 </dl>
@@ -567,6 +596,8 @@ <h4>commandListHeading</h4>
 <div class="block">Set the heading preceding the sub-commands list. May contain embedded format specifiers.
  The default heading is <code>"Commands:%n"</code> (with a line break at the end).</div>
 <dl>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd>the heading preceding the sub-commands list</dd>
 <dt><span class="seeLabel">See Also:</span></dt>
 <dd><a href="../picocli/CommandLine.Help.html#commandListHeading-java.lang.Object...-"><code>CommandLine.Help.commandListHeading(Object...)</code></a></dd>
 </dl>
@@ -588,6 +619,8 @@ <h4>footerHeading</h4>
 <pre>public abstract&nbsp;java.lang.String&nbsp;footerHeading</pre>
 <div class="block">Set the heading preceding the footer section. May contain embedded format specifiers.</div>
 <dl>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd>the heading preceding the footer section</dd>
 <dt><span class="seeLabel">See Also:</span></dt>
 <dd><a href="../picocli/CommandLine.Help.html#footerHeading-java.lang.Object...-"><code>CommandLine.Help.footerHeading(Object...)</code></a></dd>
 </dl>
@@ -609,6 +642,8 @@ <h4>footer</h4>
 <pre>public abstract&nbsp;java.lang.String[]&nbsp;footer</pre>
 <div class="block">Optional text to display after the list of options.</div>
 <dl>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd>text to display after the list of options</dd>
 <dt><span class="seeLabel">See Also:</span></dt>
 <dd><a href="../picocli/CommandLine.Help.html#footer"><code>CommandLine.Help.footer</code></a>, 
 <a href="../picocli/CommandLine.Help.html#footer-java.lang.Object...-"><code>CommandLine.Help.footer(Object...)</code></a></dd>
diff --git a/docs/apidocs/picocli/CommandLine.DuplicateOptionAnnotationsException.html b/docs/apidocs/picocli/CommandLine.DuplicateOptionAnnotationsException.html
index 6e0cc449b..86077da60 100644
--- a/docs/apidocs/picocli/CommandLine.DuplicateOptionAnnotationsException.html
+++ b/docs/apidocs/picocli/CommandLine.DuplicateOptionAnnotationsException.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_131) on Sun Apr 23 15:37:33 JST 2017 -->
-<title>CommandLine.DuplicateOptionAnnotationsException (picocli 0.9.3 API)</title>
-<meta name="date" content="2017-04-23">
+<!-- Generated by javadoc (1.8.0_131) on Thu May 04 10:49:39 JST 2017 -->
+<title>CommandLine.DuplicateOptionAnnotationsException (picocli 0.9.4 API)</title>
+<meta name="date" content="2017-05-04">
 <link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
 <script type="text/javascript" src="../script.js"></script>
 </head>
@@ -12,7 +12,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="CommandLine.DuplicateOptionAnnotationsException (picocli 0.9.3 API)";
+            parent.document.title="CommandLine.DuplicateOptionAnnotationsException (picocli 0.9.4 API)";
         }
     }
     catch(err) {
diff --git a/docs/apidocs/picocli/CommandLine.Help.Ansi.IStyle.html b/docs/apidocs/picocli/CommandLine.Help.Ansi.IStyle.html
index 8ad15a6f0..a9d545fb3 100644
--- a/docs/apidocs/picocli/CommandLine.Help.Ansi.IStyle.html
+++ b/docs/apidocs/picocli/CommandLine.Help.Ansi.IStyle.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_131) on Sun Apr 23 15:37:33 JST 2017 -->
-<title>CommandLine.Help.Ansi.IStyle (picocli 0.9.3 API)</title>
-<meta name="date" content="2017-04-23">
+<!-- Generated by javadoc (1.8.0_131) on Thu May 04 10:49:39 JST 2017 -->
+<title>CommandLine.Help.Ansi.IStyle (picocli 0.9.4 API)</title>
+<meta name="date" content="2017-05-04">
 <link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
 <script type="text/javascript" src="../script.js"></script>
 </head>
@@ -12,7 +12,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="CommandLine.Help.Ansi.IStyle (picocli 0.9.3 API)";
+            parent.document.title="CommandLine.Help.Ansi.IStyle (picocli 0.9.4 API)";
         }
     }
     catch(err) {
@@ -205,6 +205,10 @@ <h3>Method Detail</h3>
 <h4>on</h4>
 <pre>java.lang.String&nbsp;on()</pre>
 <div class="block">Returns the ANSI escape code for turning this style on.</div>
+<dl>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd>the ANSI escape code for turning this style on</dd>
+</dl>
 </li>
 </ul>
 <a name="off--">
@@ -215,6 +219,10 @@ <h4>on</h4>
 <h4>off</h4>
 <pre>java.lang.String&nbsp;off()</pre>
 <div class="block">Returns the ANSI escape code for turning this style off.</div>
+<dl>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd>the ANSI escape code for turning this style off</dd>
+</dl>
 </li>
 </ul>
 </li>
diff --git a/docs/apidocs/picocli/CommandLine.Help.Ansi.Style.html b/docs/apidocs/picocli/CommandLine.Help.Ansi.Style.html
index b080a0697..fd676c497 100644
--- a/docs/apidocs/picocli/CommandLine.Help.Ansi.Style.html
+++ b/docs/apidocs/picocli/CommandLine.Help.Ansi.Style.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_131) on Sun Apr 23 15:37:33 JST 2017 -->
-<title>CommandLine.Help.Ansi.Style (picocli 0.9.3 API)</title>
-<meta name="date" content="2017-04-23">
+<!-- Generated by javadoc (1.8.0_131) on Thu May 04 10:49:39 JST 2017 -->
+<title>CommandLine.Help.Ansi.Style (picocli 0.9.4 API)</title>
+<meta name="date" content="2017-05-04">
 <link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
 <script type="text/javascript" src="../script.js"></script>
 </head>
@@ -12,7 +12,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="CommandLine.Help.Ansi.Style (picocli 0.9.3 API)";
+            parent.document.title="CommandLine.Help.Ansi.Style (picocli 0.9.4 API)";
         }
     }
     catch(err) {
@@ -596,6 +596,8 @@ <h4>on</h4>
 <dl>
 <dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
 <dd><code><a href="../picocli/CommandLine.Help.Ansi.IStyle.html#on--">on</a></code>&nbsp;in interface&nbsp;<code><a href="../picocli/CommandLine.Help.Ansi.IStyle.html" title="interface in picocli">CommandLine.Help.Ansi.IStyle</a></code></dd>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd>the ANSI escape code for turning this style on</dd>
 </dl>
 </li>
 </ul>
@@ -611,6 +613,8 @@ <h4>off</h4>
 <dl>
 <dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
 <dd><code><a href="../picocli/CommandLine.Help.Ansi.IStyle.html#off--">off</a></code>&nbsp;in interface&nbsp;<code><a href="../picocli/CommandLine.Help.Ansi.IStyle.html" title="interface in picocli">CommandLine.Help.Ansi.IStyle</a></code></dd>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd>the ANSI escape code for turning this style off</dd>
 </dl>
 </li>
 </ul>
@@ -622,6 +626,12 @@ <h4>off</h4>
 <h4>on</h4>
 <pre>public static&nbsp;java.lang.String&nbsp;on(<a href="../picocli/CommandLine.Help.Ansi.IStyle.html" title="interface in picocli">CommandLine.Help.Ansi.IStyle</a>...&nbsp;styles)</pre>
 <div class="block">Returns the concatenated ANSI escape codes for turning all specified styles on.</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>styles</code> - the styles to generate ANSI escape codes for</dd>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd>the concatenated ANSI escape codes for turning all specified styles on</dd>
+</dl>
 </li>
 </ul>
 <a name="off-picocli.CommandLine.Help.Ansi.IStyle...-">
@@ -632,6 +642,12 @@ <h4>on</h4>
 <h4>off</h4>
 <pre>public static&nbsp;java.lang.String&nbsp;off(<a href="../picocli/CommandLine.Help.Ansi.IStyle.html" title="interface in picocli">CommandLine.Help.Ansi.IStyle</a>...&nbsp;styles)</pre>
 <div class="block">Returns the concatenated ANSI escape codes for turning all specified styles off.</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>styles</code> - the styles to generate ANSI escape codes for</dd>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd>the concatenated ANSI escape codes for turning all specified styles off</dd>
+</dl>
 </li>
 </ul>
 <a name="fg-java.lang.String-">
@@ -643,10 +659,11 @@ <h4>fg</h4>
 <pre>public static&nbsp;<a href="../picocli/CommandLine.Help.Ansi.IStyle.html" title="interface in picocli">CommandLine.Help.Ansi.IStyle</a>&nbsp;fg(java.lang.String&nbsp;str)</pre>
 <div class="block">Parses the specified style markup and returns the associated style.
   The markup may be one of the Style enum value names, or it may be one of the Style enum value
-  names when <code>"fg_"</code> is prepended, or it may be an <code>RGB Color int</code>.</div>
+  names when <code>"fg_"</code> is prepended, or it may be one of the indexed colors in the 256 color palette.</div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>str</code> - the case-insensitive style markup to convert, e.g. <code>"blue"</code> or <code>"fg_blue"</code></dd>
+<dd><code>str</code> - the case-insensitive style markup to convert, e.g. <code>"blue"</code> or <code>"fg_blue"</code>,
+          or <code>"46"</code> (indexed color) or <code>"0;5;0"</code> (RGB components of an indexed color)</dd>
 <dt><span class="returnLabel">Returns:</span></dt>
 <dd>the IStyle for the specified converter</dd>
 </dl>
@@ -661,10 +678,11 @@ <h4>bg</h4>
 <pre>public static&nbsp;<a href="../picocli/CommandLine.Help.Ansi.IStyle.html" title="interface in picocli">CommandLine.Help.Ansi.IStyle</a>&nbsp;bg(java.lang.String&nbsp;str)</pre>
 <div class="block">Parses the specified style markup and returns the associated style.
   The markup may be one of the Style enum value names, or it may be one of the Style enum value
-  names when <code>"bg_"</code> is prepended, or it may be an <code>RGB Color int</code>.</div>
+  names when <code>"bg_"</code> is prepended, or it may be one of the indexed colors in the 256 color palette.</div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>str</code> - the case-insensitive style markup to convert, e.g. <code>"blue"</code> or <code>"bg_blue"</code></dd>
+<dd><code>str</code> - the case-insensitive style markup to convert, e.g. <code>"blue"</code> or <code>"bg_blue"</code>,
+          or <code>"46"</code> (indexed color) or <code>"0;5;0"</code> (RGB components of an indexed color)</dd>
 <dt><span class="returnLabel">Returns:</span></dt>
 <dd>the IStyle for the specified converter</dd>
 </dl>
diff --git a/docs/apidocs/picocli/CommandLine.Help.Ansi.Text.html b/docs/apidocs/picocli/CommandLine.Help.Ansi.Text.html
index 430c62d87..fce0827be 100644
--- a/docs/apidocs/picocli/CommandLine.Help.Ansi.Text.html
+++ b/docs/apidocs/picocli/CommandLine.Help.Ansi.Text.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_131) on Sun Apr 23 15:37:33 JST 2017 -->
-<title>CommandLine.Help.Ansi.Text (picocli 0.9.3 API)</title>
-<meta name="date" content="2017-04-23">
+<!-- Generated by javadoc (1.8.0_131) on Thu May 04 10:49:39 JST 2017 -->
+<title>CommandLine.Help.Ansi.Text (picocli 0.9.4 API)</title>
+<meta name="date" content="2017-05-04">
 <link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
 <script type="text/javascript" src="../script.js"></script>
 </head>
@@ -12,7 +12,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="CommandLine.Help.Ansi.Text (picocli 0.9.3 API)";
+            parent.document.title="CommandLine.Help.Ansi.Text (picocli 0.9.4 API)";
         }
     }
     catch(err) {
@@ -207,7 +207,7 @@ <h3>Method Summary</h3>
 <tr id="i7" class="rowColor">
 <td class="colFirst"><code>java.lang.String</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Help.Ansi.Text.html#plainString--">plainString</a></span>()</code>
-<div class="block">Returns the plain text without any formatting</div>
+<div class="block">Returns the plain text without any formatting.</div>
 </td>
 </tr>
 <tr id="i8" class="altColor">
@@ -260,6 +260,10 @@ <h3>Constructor Detail</h3>
 <h4>Text</h4>
 <pre>public&nbsp;Text(int&nbsp;maxLength)</pre>
 <div class="block">Constructs a Text with the specified max length (for use in a TextTable Column).</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>maxLength</code> - max length of this text</dd>
+</dl>
 </li>
 </ul>
 <a name="Text-java.lang.String-">
@@ -306,6 +310,12 @@ <h4>clone</h4>
 <h4>substring</h4>
 <pre>public&nbsp;<a href="../picocli/CommandLine.Help.Ansi.Text.html" title="class in picocli">CommandLine.Help.Ansi.Text</a>&nbsp;substring(int&nbsp;start)</pre>
 <div class="block">Returns a new <code>Text</code> instance that is a substring of this Text. Does not modify this instance!</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>start</code> - index in the plain text where to start the substring</dd>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd>a new Text instance that is a substring of this Text</dd>
+</dl>
 </li>
 </ul>
 <a name="substring-int-int-">
@@ -317,6 +327,13 @@ <h4>substring</h4>
 <pre>public&nbsp;<a href="../picocli/CommandLine.Help.Ansi.Text.html" title="class in picocli">CommandLine.Help.Ansi.Text</a>&nbsp;substring(int&nbsp;start,
                                             int&nbsp;end)</pre>
 <div class="block">Returns a new <code>Text</code> instance that is a substring of this Text. Does not modify this instance!</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>start</code> - index in the plain text where to start the substring</dd>
+<dd><code>end</code> - index in the plain text where to end the substring</dd>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd>a new Text instance that is a substring of this Text</dd>
+</dl>
 </li>
 </ul>
 <a name="append-java.lang.String-">
@@ -327,6 +344,12 @@ <h4>substring</h4>
 <h4>append</h4>
 <pre>public&nbsp;<a href="../picocli/CommandLine.Help.Ansi.Text.html" title="class in picocli">CommandLine.Help.Ansi.Text</a>&nbsp;append(java.lang.String&nbsp;string)</pre>
 <div class="block">Returns a new <code>Text</code> instance with the specified text appended. Does not modify this instance!</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>string</code> - the text to append</dd>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd>a new Text instance</dd>
+</dl>
 </li>
 </ul>
 <a name="append-picocli.CommandLine.Help.Ansi.Text-">
@@ -337,6 +360,12 @@ <h4>append</h4>
 <h4>append</h4>
 <pre>public&nbsp;<a href="../picocli/CommandLine.Help.Ansi.Text.html" title="class in picocli">CommandLine.Help.Ansi.Text</a>&nbsp;append(<a href="../picocli/CommandLine.Help.Ansi.Text.html" title="class in picocli">CommandLine.Help.Ansi.Text</a>&nbsp;other)</pre>
 <div class="block">Returns a new <code>Text</code> instance with the specified text appended. Does not modify this instance!</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>other</code> - the text to append</dd>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd>a new Text instance</dd>
+</dl>
 </li>
 </ul>
 <a name="getStyledChars-int-int-picocli.CommandLine.Help.Ansi.Text-int-">
@@ -366,7 +395,11 @@ <h4>getStyledChars</h4>
 <li class="blockList">
 <h4>plainString</h4>
 <pre>public&nbsp;java.lang.String&nbsp;plainString()</pre>
-<div class="block">Returns the plain text without any formatting</div>
+<div class="block">Returns the plain text without any formatting.</div>
+<dl>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd>the plain text without any formatting</dd>
+</dl>
 </li>
 </ul>
 <a name="equals-java.lang.Object-">
@@ -407,6 +440,8 @@ <h4>toString</h4>
 <dl>
 <dt><span class="overrideSpecifyLabel">Overrides:</span></dt>
 <dd><code>toString</code>&nbsp;in class&nbsp;<code>java.lang.Object</code></dd>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd>a String representation of the text with ANSI escape codes embedded (if enabled)</dd>
 </dl>
 </li>
 </ul>
diff --git a/docs/apidocs/picocli/CommandLine.Help.Ansi.html b/docs/apidocs/picocli/CommandLine.Help.Ansi.html
index abb4cbfa7..c10b01b79 100644
--- a/docs/apidocs/picocli/CommandLine.Help.Ansi.html
+++ b/docs/apidocs/picocli/CommandLine.Help.Ansi.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_131) on Sun Apr 23 15:37:33 JST 2017 -->
-<title>CommandLine.Help.Ansi (picocli 0.9.3 API)</title>
-<meta name="date" content="2017-04-23">
+<!-- Generated by javadoc (1.8.0_131) on Thu May 04 10:49:39 JST 2017 -->
+<title>CommandLine.Help.Ansi (picocli 0.9.4 API)</title>
+<meta name="date" content="2017-05-04">
 <link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
 <script type="text/javascript" src="../script.js"></script>
 </head>
@@ -12,7 +12,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="CommandLine.Help.Ansi (picocli 0.9.3 API)";
+            parent.document.title="CommandLine.Help.Ansi (picocli 0.9.4 API)";
         }
     }
     catch(err) {
@@ -204,6 +204,10 @@ <h3>Method Detail</h3>
 <h4>enabled</h4>
 <pre>public static&nbsp;boolean&nbsp;enabled()</pre>
 <div class="block">Enabled if it is forced ON or if the platform supports ANSI escape codes and it is not forced OFF.</div>
+<dl>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd><code>true</code> if ANSI escape codes are enabled</dd>
+</dl>
 </li>
 </ul>
 </li>
diff --git a/docs/apidocs/picocli/CommandLine.Help.ColorScheme.html b/docs/apidocs/picocli/CommandLine.Help.ColorScheme.html
index 8334d26b1..2bacad3dc 100644
--- a/docs/apidocs/picocli/CommandLine.Help.ColorScheme.html
+++ b/docs/apidocs/picocli/CommandLine.Help.ColorScheme.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_131) on Sun Apr 23 15:37:33 JST 2017 -->
-<title>CommandLine.Help.ColorScheme (picocli 0.9.3 API)</title>
-<meta name="date" content="2017-04-23">
+<!-- Generated by javadoc (1.8.0_131) on Thu May 04 10:49:39 JST 2017 -->
+<title>CommandLine.Help.ColorScheme (picocli 0.9.4 API)</title>
+<meta name="date" content="2017-05-04">
 <link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
 <script type="text/javascript" src="../script.js"></script>
 </head>
@@ -12,7 +12,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="CommandLine.Help.ColorScheme (picocli 0.9.3 API)";
+            parent.document.title="CommandLine.Help.ColorScheme (picocli 0.9.4 API)";
         }
     }
     catch(err) {
@@ -197,7 +197,7 @@ <h3>Method Summary</h3>
 <tr id="i1" class="rowColor">
 <td class="colFirst"><code><a href="../picocli/CommandLine.Help.ColorScheme.html" title="class in picocli">CommandLine.Help.ColorScheme</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Help.ColorScheme.html#commands-picocli.CommandLine.Help.Ansi.IStyle...-">commands</a></span>(<a href="../picocli/CommandLine.Help.Ansi.IStyle.html" title="interface in picocli">CommandLine.Help.Ansi.IStyle</a>...&nbsp;styles)</code>
-<div class="block">Adds the specified styles to the styles for commands in this color scheme and returns this color scheme.</div>
+<div class="block">Adds the specified styles to the registered styles for commands in this color scheme and returns this color scheme.</div>
 </td>
 </tr>
 <tr id="i2" class="altColor">
@@ -209,7 +209,7 @@ <h3>Method Summary</h3>
 <tr id="i3" class="rowColor">
 <td class="colFirst"><code><a href="../picocli/CommandLine.Help.ColorScheme.html" title="class in picocli">CommandLine.Help.ColorScheme</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Help.ColorScheme.html#optionParams-picocli.CommandLine.Help.Ansi.IStyle...-">optionParams</a></span>(<a href="../picocli/CommandLine.Help.Ansi.IStyle.html" title="interface in picocli">CommandLine.Help.Ansi.IStyle</a>...&nbsp;styles)</code>
-<div class="block">Adds the specified styles to the styles for option parameters in this color scheme and returns this color scheme.</div>
+<div class="block">Adds the specified styles to the registered styles for option parameters in this color scheme and returns this color scheme.</div>
 </td>
 </tr>
 <tr id="i4" class="altColor">
@@ -221,7 +221,7 @@ <h3>Method Summary</h3>
 <tr id="i5" class="rowColor">
 <td class="colFirst"><code><a href="../picocli/CommandLine.Help.ColorScheme.html" title="class in picocli">CommandLine.Help.ColorScheme</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Help.ColorScheme.html#options-picocli.CommandLine.Help.Ansi.IStyle...-">options</a></span>(<a href="../picocli/CommandLine.Help.Ansi.IStyle.html" title="interface in picocli">CommandLine.Help.Ansi.IStyle</a>...&nbsp;styles)</code>
-<div class="block">Adds the specified styles to the styles for options in this color scheme and returns this color scheme.</div>
+<div class="block">Adds the specified styles to the registered styles for options in this color scheme and returns this color scheme.</div>
 </td>
 </tr>
 <tr id="i6" class="altColor">
@@ -233,7 +233,7 @@ <h3>Method Summary</h3>
 <tr id="i7" class="rowColor">
 <td class="colFirst"><code><a href="../picocli/CommandLine.Help.ColorScheme.html" title="class in picocli">CommandLine.Help.ColorScheme</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Help.ColorScheme.html#parameters-picocli.CommandLine.Help.Ansi.IStyle...-">parameters</a></span>(<a href="../picocli/CommandLine.Help.Ansi.IStyle.html" title="interface in picocli">CommandLine.Help.Ansi.IStyle</a>...&nbsp;styles)</code>
-<div class="block">Adds the specified styles to the styles for positional parameters in this color scheme and returns this color scheme.</div>
+<div class="block">Adds the specified styles to the registered styles for positional parameters in this color scheme and returns this color scheme.</div>
 </td>
 </tr>
 <tr id="i8" class="altColor">
@@ -332,7 +332,13 @@ <h3>Method Detail</h3>
 <li class="blockList">
 <h4>commands</h4>
 <pre>public&nbsp;<a href="../picocli/CommandLine.Help.ColorScheme.html" title="class in picocli">CommandLine.Help.ColorScheme</a>&nbsp;commands(<a href="../picocli/CommandLine.Help.Ansi.IStyle.html" title="interface in picocli">CommandLine.Help.Ansi.IStyle</a>...&nbsp;styles)</pre>
-<div class="block">Adds the specified styles to the styles for commands in this color scheme and returns this color scheme.</div>
+<div class="block">Adds the specified styles to the registered styles for commands in this color scheme and returns this color scheme.</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>styles</code> - the styles to add to the registered styles for commands in this color scheme</dd>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd>this color scheme to enable method chaining for a more fluent API</dd>
+</dl>
 </li>
 </ul>
 <a name="options-picocli.CommandLine.Help.Ansi.IStyle...-">
@@ -342,7 +348,13 @@ <h4>commands</h4>
 <li class="blockList">
 <h4>options</h4>
 <pre>public&nbsp;<a href="../picocli/CommandLine.Help.ColorScheme.html" title="class in picocli">CommandLine.Help.ColorScheme</a>&nbsp;options(<a href="../picocli/CommandLine.Help.Ansi.IStyle.html" title="interface in picocli">CommandLine.Help.Ansi.IStyle</a>...&nbsp;styles)</pre>
-<div class="block">Adds the specified styles to the styles for options in this color scheme and returns this color scheme.</div>
+<div class="block">Adds the specified styles to the registered styles for options in this color scheme and returns this color scheme.</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>styles</code> - the styles to add to registered the styles for options in this color scheme</dd>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd>this color scheme to enable method chaining for a more fluent API</dd>
+</dl>
 </li>
 </ul>
 <a name="parameters-picocli.CommandLine.Help.Ansi.IStyle...-">
@@ -352,7 +364,13 @@ <h4>options</h4>
 <li class="blockList">
 <h4>parameters</h4>
 <pre>public&nbsp;<a href="../picocli/CommandLine.Help.ColorScheme.html" title="class in picocli">CommandLine.Help.ColorScheme</a>&nbsp;parameters(<a href="../picocli/CommandLine.Help.Ansi.IStyle.html" title="interface in picocli">CommandLine.Help.Ansi.IStyle</a>...&nbsp;styles)</pre>
-<div class="block">Adds the specified styles to the styles for positional parameters in this color scheme and returns this color scheme.</div>
+<div class="block">Adds the specified styles to the registered styles for positional parameters in this color scheme and returns this color scheme.</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>styles</code> - the styles to add to registered the styles for parameters in this color scheme</dd>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd>this color scheme to enable method chaining for a more fluent API</dd>
+</dl>
 </li>
 </ul>
 <a name="optionParams-picocli.CommandLine.Help.Ansi.IStyle...-">
@@ -362,7 +380,13 @@ <h4>parameters</h4>
 <li class="blockList">
 <h4>optionParams</h4>
 <pre>public&nbsp;<a href="../picocli/CommandLine.Help.ColorScheme.html" title="class in picocli">CommandLine.Help.ColorScheme</a>&nbsp;optionParams(<a href="../picocli/CommandLine.Help.Ansi.IStyle.html" title="interface in picocli">CommandLine.Help.Ansi.IStyle</a>...&nbsp;styles)</pre>
-<div class="block">Adds the specified styles to the styles for option parameters in this color scheme and returns this color scheme.</div>
+<div class="block">Adds the specified styles to the registered styles for option parameters in this color scheme and returns this color scheme.</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>styles</code> - the styles to add to the registered styles for option parameters in this color scheme</dd>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd>this color scheme to enable method chaining for a more fluent API</dd>
+</dl>
 </li>
 </ul>
 <a name="commandText-java.lang.String-">
@@ -373,6 +397,12 @@ <h4>optionParams</h4>
 <h4>commandText</h4>
 <pre>public&nbsp;<a href="../picocli/CommandLine.Help.Ansi.Text.html" title="class in picocli">CommandLine.Help.Ansi.Text</a>&nbsp;commandText(java.lang.String&nbsp;command)</pre>
 <div class="block">Returns a Text with all command styles applied to the specified command string.</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>command</code> - the command string to apply the registered command styles to</dd>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd>a Text with all command styles applied to the specified command string</dd>
+</dl>
 </li>
 </ul>
 <a name="optionText-java.lang.String-">
@@ -383,6 +413,12 @@ <h4>commandText</h4>
 <h4>optionText</h4>
 <pre>public&nbsp;<a href="../picocli/CommandLine.Help.Ansi.Text.html" title="class in picocli">CommandLine.Help.Ansi.Text</a>&nbsp;optionText(java.lang.String&nbsp;option)</pre>
 <div class="block">Returns a Text with all option styles applied to the specified option string.</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>option</code> - the option string to apply the registered option styles to</dd>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd>a Text with all option styles applied to the specified option string</dd>
+</dl>
 </li>
 </ul>
 <a name="parameterText-java.lang.String-">
@@ -393,6 +429,12 @@ <h4>optionText</h4>
 <h4>parameterText</h4>
 <pre>public&nbsp;<a href="../picocli/CommandLine.Help.Ansi.Text.html" title="class in picocli">CommandLine.Help.Ansi.Text</a>&nbsp;parameterText(java.lang.String&nbsp;parameter)</pre>
 <div class="block">Returns a Text with all parameter styles applied to the specified parameter string.</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>parameter</code> - the parameter string to apply the registered parameter styles to</dd>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd>a Text with all parameter styles applied to the specified parameter string</dd>
+</dl>
 </li>
 </ul>
 <a name="optionParamText-java.lang.String-">
@@ -403,6 +445,12 @@ <h4>parameterText</h4>
 <h4>optionParamText</h4>
 <pre>public&nbsp;<a href="../picocli/CommandLine.Help.Ansi.Text.html" title="class in picocli">CommandLine.Help.Ansi.Text</a>&nbsp;optionParamText(java.lang.String&nbsp;optionParam)</pre>
 <div class="block">Returns a Text with all optionParam styles applied to the specified optionParam string.</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>optionParam</code> - the option parameter string to apply the registered option parameter styles to</dd>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd>a Text with all option parameter styles applied to the specified option parameter string</dd>
+</dl>
 </li>
 </ul>
 <a name="applySystemProperties--">
diff --git a/docs/apidocs/picocli/CommandLine.Help.Column.Overflow.html b/docs/apidocs/picocli/CommandLine.Help.Column.Overflow.html
index ff1d73995..2f1c93bf3 100644
--- a/docs/apidocs/picocli/CommandLine.Help.Column.Overflow.html
+++ b/docs/apidocs/picocli/CommandLine.Help.Column.Overflow.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_131) on Sun Apr 23 15:37:34 JST 2017 -->
-<title>CommandLine.Help.Column.Overflow (picocli 0.9.3 API)</title>
-<meta name="date" content="2017-04-23">
+<!-- Generated by javadoc (1.8.0_131) on Thu May 04 10:49:39 JST 2017 -->
+<title>CommandLine.Help.Column.Overflow (picocli 0.9.4 API)</title>
+<meta name="date" content="2017-05-04">
 <link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
 <script type="text/javascript" src="../script.js"></script>
 </head>
@@ -12,7 +12,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="CommandLine.Help.Column.Overflow (picocli 0.9.3 API)";
+            parent.document.title="CommandLine.Help.Column.Overflow (picocli 0.9.4 API)";
         }
     }
     catch(err) {
diff --git a/docs/apidocs/picocli/CommandLine.Help.Column.html b/docs/apidocs/picocli/CommandLine.Help.Column.html
index 13e791ca9..764ab80bd 100644
--- a/docs/apidocs/picocli/CommandLine.Help.Column.html
+++ b/docs/apidocs/picocli/CommandLine.Help.Column.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_131) on Sun Apr 23 15:37:34 JST 2017 -->
-<title>CommandLine.Help.Column (picocli 0.9.3 API)</title>
-<meta name="date" content="2017-04-23">
+<!-- Generated by javadoc (1.8.0_131) on Thu May 04 10:49:39 JST 2017 -->
+<title>CommandLine.Help.Column (picocli 0.9.4 API)</title>
+<meta name="date" content="2017-05-04">
 <link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
 <script type="text/javascript" src="../script.js"></script>
 </head>
@@ -12,7 +12,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="CommandLine.Help.Column (picocli 0.9.3 API)";
+            parent.document.title="CommandLine.Help.Column (picocli 0.9.4 API)";
         }
     }
     catch(err) {
diff --git a/docs/apidocs/picocli/CommandLine.Help.IOptionRenderer.html b/docs/apidocs/picocli/CommandLine.Help.IOptionRenderer.html
index e76332de3..184980bf7 100644
--- a/docs/apidocs/picocli/CommandLine.Help.IOptionRenderer.html
+++ b/docs/apidocs/picocli/CommandLine.Help.IOptionRenderer.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_131) on Sun Apr 23 15:37:34 JST 2017 -->
-<title>CommandLine.Help.IOptionRenderer (picocli 0.9.3 API)</title>
-<meta name="date" content="2017-04-23">
+<!-- Generated by javadoc (1.8.0_131) on Thu May 04 10:49:39 JST 2017 -->
+<title>CommandLine.Help.IOptionRenderer (picocli 0.9.4 API)</title>
+<meta name="date" content="2017-05-04">
 <link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
 <script type="text/javascript" src="../script.js"></script>
 </head>
@@ -12,7 +12,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="CommandLine.Help.IOptionRenderer (picocli 0.9.3 API)";
+            parent.document.title="CommandLine.Help.IOptionRenderer (picocli 0.9.4 API)";
         }
     }
     catch(err) {
diff --git a/docs/apidocs/picocli/CommandLine.Help.IParamLabelRenderer.html b/docs/apidocs/picocli/CommandLine.Help.IParamLabelRenderer.html
index 979707f63..26d529778 100644
--- a/docs/apidocs/picocli/CommandLine.Help.IParamLabelRenderer.html
+++ b/docs/apidocs/picocli/CommandLine.Help.IParamLabelRenderer.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_131) on Sun Apr 23 15:37:34 JST 2017 -->
-<title>CommandLine.Help.IParamLabelRenderer (picocli 0.9.3 API)</title>
-<meta name="date" content="2017-04-23">
+<!-- Generated by javadoc (1.8.0_131) on Thu May 04 10:49:39 JST 2017 -->
+<title>CommandLine.Help.IParamLabelRenderer (picocli 0.9.4 API)</title>
+<meta name="date" content="2017-05-04">
 <link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
 <script type="text/javascript" src="../script.js"></script>
 </head>
@@ -12,7 +12,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="CommandLine.Help.IParamLabelRenderer (picocli 0.9.3 API)";
+            parent.document.title="CommandLine.Help.IParamLabelRenderer (picocli 0.9.4 API)";
         }
     }
     catch(err) {
@@ -135,7 +135,7 @@ <h3>Method Summary</h3>
 <tr id="i1" class="rowColor">
 <td class="colFirst"><code>java.lang.String</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Help.IParamLabelRenderer.html#separator--">separator</a></span>()</code>
-<div class="block">Returns the separator between option name and param label</div>
+<div class="block">Returns the separator between option name and param label.</div>
 </td>
 </tr>
 </table>
@@ -163,6 +163,13 @@ <h4>renderParameterLabel</h4>
                                                 java.util.List&lt;<a href="../picocli/CommandLine.Help.Ansi.IStyle.html" title="interface in picocli">CommandLine.Help.Ansi.IStyle</a>&gt;&nbsp;styles)</pre>
 <div class="block">Returns a text rendering of the Option parameter or positional parameter; returns an empty string
  <code>""</code> if the option is a boolean and does not take a parameter.</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>field</code> - the annotated field with a parameter label</dd>
+<dd><code>styles</code> - the styles to apply to the parameter label</dd>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd>a text rendering of the Option parameter or positional parameter</dd>
+</dl>
 </li>
 </ul>
 <a name="separator--">
@@ -172,7 +179,11 @@ <h4>renderParameterLabel</h4>
 <li class="blockList">
 <h4>separator</h4>
 <pre>java.lang.String&nbsp;separator()</pre>
-<div class="block">Returns the separator between option name and param label</div>
+<div class="block">Returns the separator between option name and param label.</div>
+<dl>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd>the separator between option name and param label</dd>
+</dl>
 </li>
 </ul>
 </li>
diff --git a/docs/apidocs/picocli/CommandLine.Help.IParameterRenderer.html b/docs/apidocs/picocli/CommandLine.Help.IParameterRenderer.html
index 0cc59d49d..4b686a02d 100644
--- a/docs/apidocs/picocli/CommandLine.Help.IParameterRenderer.html
+++ b/docs/apidocs/picocli/CommandLine.Help.IParameterRenderer.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_131) on Sun Apr 23 15:37:34 JST 2017 -->
-<title>CommandLine.Help.IParameterRenderer (picocli 0.9.3 API)</title>
-<meta name="date" content="2017-04-23">
+<!-- Generated by javadoc (1.8.0_131) on Thu May 04 10:49:39 JST 2017 -->
+<title>CommandLine.Help.IParameterRenderer (picocli 0.9.4 API)</title>
+<meta name="date" content="2017-05-04">
 <link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
 <script type="text/javascript" src="../script.js"></script>
 </head>
@@ -12,7 +12,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="CommandLine.Help.IParameterRenderer (picocli 0.9.3 API)";
+            parent.document.title="CommandLine.Help.IParameterRenderer (picocli 0.9.4 API)";
         }
     }
     catch(err) {
diff --git a/docs/apidocs/picocli/CommandLine.Help.Layout.html b/docs/apidocs/picocli/CommandLine.Help.Layout.html
index 25db85e53..7ab13833c 100644
--- a/docs/apidocs/picocli/CommandLine.Help.Layout.html
+++ b/docs/apidocs/picocli/CommandLine.Help.Layout.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_131) on Sun Apr 23 15:37:34 JST 2017 -->
-<title>CommandLine.Help.Layout (picocli 0.9.3 API)</title>
-<meta name="date" content="2017-04-23">
+<!-- Generated by javadoc (1.8.0_131) on Thu May 04 10:49:39 JST 2017 -->
+<title>CommandLine.Help.Layout (picocli 0.9.4 API)</title>
+<meta name="date" content="2017-05-04">
 <link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
 <script type="text/javascript" src="../script.js"></script>
 </head>
@@ -12,7 +12,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="CommandLine.Help.Layout (picocli 0.9.3 API)";
+            parent.document.title="CommandLine.Help.Layout (picocli 0.9.4 API)";
         }
     }
     catch(err) {
@@ -117,7 +117,7 @@ <h2 title="Class CommandLine.Help.Layout" class="title">Class CommandLine.Help.L
  <p>Delegates to the renderers to create <a href="../picocli/CommandLine.Help.Ansi.Text.html" title="class in picocli"><code>CommandLine.Help.Ansi.Text</code></a> values for the annotated fields, and uses a
  <a href="../picocli/CommandLine.Help.TextTable.html" title="class in picocli"><code>CommandLine.Help.TextTable</code></a> to display these values in tabular format. Layout is responsible for deciding which values
  to display where in the table. By default, Layout shows one option or parameter per table row.</p>
- <p>Customize by overriding the <code>#layout(Field, Text[][])</code> method.</p></div>
+ <p>Customize by overriding the <a href="../picocli/CommandLine.Help.Layout.html#layout-java.lang.reflect.Field-picocli.CommandLine.Help.Ansi.Text:A:A-"><code>layout(Field, CommandLine.Help.Ansi.Text[][])</code></a> method.</p></div>
 <dl>
 <dt><span class="seeLabel">See Also:</span></dt>
 <dd><a href="../picocli/CommandLine.Help.IOptionRenderer.html" title="interface in picocli"><code>rendering options to text</code></a>, 
@@ -216,7 +216,7 @@ <h3>Method Summary</h3>
 <td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Help.Layout.html#addOption-java.lang.reflect.Field-picocli.CommandLine.Help.IParamLabelRenderer-">addOption</a></span>(java.lang.reflect.Field&nbsp;field,
          <a href="../picocli/CommandLine.Help.IParamLabelRenderer.html" title="interface in picocli">CommandLine.Help.IParamLabelRenderer</a>&nbsp;paramLabelRenderer)</code>
 <div class="block">Delegates to the <a href="../picocli/CommandLine.Help.Layout.html#optionRenderer"><code>option renderer</code></a> of this layout to obtain
- text values for the specified <a href="../picocli/CommandLine.Option.html" title="annotation in picocli"><code>CommandLine.Option</code></a>, and then calls the <code>#layout(Field, Text[][])</code>
+ text values for the specified <a href="../picocli/CommandLine.Option.html" title="annotation in picocli"><code>CommandLine.Option</code></a>, and then calls the <a href="../picocli/CommandLine.Help.Layout.html#layout-java.lang.reflect.Field-picocli.CommandLine.Help.Ansi.Text:A:A-"><code>layout(Field, CommandLine.Help.Ansi.Text[][])</code></a>
  method to write these text values into the correct cells in the TextTable.</div>
 </td>
 </tr>
@@ -233,7 +233,7 @@ <h3>Method Summary</h3>
                       <a href="../picocli/CommandLine.Help.IParamLabelRenderer.html" title="interface in picocli">CommandLine.Help.IParamLabelRenderer</a>&nbsp;paramLabelRenderer)</code>
 <div class="block">Delegates to the <a href="../picocli/CommandLine.Help.Layout.html#parameterRenderer"><code>parameter renderer</code></a> of this layout
  to obtain text values for the specified <a href="../picocli/CommandLine.Parameters.html" title="annotation in picocli"><code>CommandLine.Parameters</code></a>, and then calls
- <code>#layout(Field, Text[][])</code> to write these text values into the correct cells in the TextTable.</div>
+ <a href="../picocli/CommandLine.Help.Layout.html#layout-java.lang.reflect.Field-picocli.CommandLine.Help.Ansi.Text:A:A-"><code>layout(Field, CommandLine.Help.Ansi.Text[][])</code></a> to write these text values into the correct cells in the TextTable.</div>
 </td>
 </tr>
 <tr id="i3" class="rowColor">
@@ -332,6 +332,10 @@ <h4>Layout</h4>
 <div class="block">Constructs a Layout with the specified color scheme, a new default TextTable, the
  <a href="../picocli/CommandLine.Help.html#createDefaultOptionRenderer--">default option renderer</a>, and the
  <a href="../picocli/CommandLine.Help.html#createDefaultParameterRenderer--">default parameter renderer</a>.</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>colorScheme</code> - the color scheme to use for common, auto-generated parts of the usage help message</dd>
+</dl>
 </li>
 </ul>
 <a name="Layout-picocli.CommandLine.Help.ColorScheme-picocli.CommandLine.Help.TextTable-">
@@ -345,6 +349,11 @@ <h4>Layout</h4>
 <div class="block">Constructs a Layout with the specified color scheme, the specified TextTable, the
  <a href="../picocli/CommandLine.Help.html#createDefaultOptionRenderer--">default option renderer</a>, and the
  <a href="../picocli/CommandLine.Help.html#createDefaultParameterRenderer--">default parameter renderer</a>.</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>colorScheme</code> - the color scheme to use for common, auto-generated parts of the usage help message</dd>
+<dd><code>textTable</code> - the TextTable to lay out parts of the usage help message in tabular format</dd>
+</dl>
 </li>
 </ul>
 <a name="Layout-picocli.CommandLine.Help.ColorScheme-picocli.CommandLine.Help.TextTable-picocli.CommandLine.Help.IOptionRenderer-picocli.CommandLine.Help.IParameterRenderer-">
@@ -359,6 +368,13 @@ <h4>Layout</h4>
               <a href="../picocli/CommandLine.Help.IParameterRenderer.html" title="interface in picocli">CommandLine.Help.IParameterRenderer</a>&nbsp;parameterRenderer)</pre>
 <div class="block">Constructs a Layout with the specified color scheme, the specified TextTable, the
  specified option renderer and the specified parameter renderer.</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>colorScheme</code> - the color scheme to use for common, auto-generated parts of the usage help message</dd>
+<dd><code>optionRenderer</code> - the object responsible for rendering Options to Text</dd>
+<dd><code>parameterRenderer</code> - the object responsible for rendering Parameters to Text</dd>
+<dd><code>textTable</code> - the TextTable to lay out parts of the usage help message in tabular format</dd>
+</dl>
 </li>
 </ul>
 </li>
@@ -378,7 +394,7 @@ <h4>layout</h4>
 <pre>public&nbsp;void&nbsp;layout(java.lang.reflect.Field&nbsp;field,
                    <a href="../picocli/CommandLine.Help.Ansi.Text.html" title="class in picocli">CommandLine.Help.Ansi.Text</a>[][]&nbsp;cellValues)</pre>
 <div class="block">Copies the specified text values into the correct cells in the <a href="../picocli/CommandLine.Help.TextTable.html" title="class in picocli"><code>CommandLine.Help.TextTable</code></a>. This implementation
- delegates to <code>TextTable#addRowValues(Text...)</code> for each row of values.
+ delegates to <a href="../picocli/CommandLine.Help.TextTable.html#addRowValues-picocli.CommandLine.Help.Ansi.Text...-"><code>CommandLine.Help.TextTable.addRowValues(CommandLine.Help.Ansi.Text...)</code></a> for each row of values.
  <p>Subclasses may override.</p></div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
@@ -396,6 +412,11 @@ <h4>addOptions</h4>
 <pre>public&nbsp;void&nbsp;addOptions(java.util.List&lt;java.lang.reflect.Field&gt;&nbsp;fields,
                        <a href="../picocli/CommandLine.Help.IParamLabelRenderer.html" title="interface in picocli">CommandLine.Help.IParamLabelRenderer</a>&nbsp;paramLabelRenderer)</pre>
 <div class="block">Calls <a href="../picocli/CommandLine.Help.Layout.html#addOption-java.lang.reflect.Field-picocli.CommandLine.Help.IParamLabelRenderer-"><code>addOption(Field, CommandLine.Help.IParamLabelRenderer)</code></a> for all non-hidden Options in the list.</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>fields</code> - fields annotated with <a href="../picocli/CommandLine.Option.html" title="annotation in picocli"><code>CommandLine.Option</code></a> to add usage descriptions for</dd>
+<dd><code>paramLabelRenderer</code> - object that knows how to render option parameters</dd>
+</dl>
 </li>
 </ul>
 <a name="addOption-java.lang.reflect.Field-picocli.CommandLine.Help.IParamLabelRenderer-">
@@ -407,7 +428,7 @@ <h4>addOption</h4>
 <pre>public&nbsp;void&nbsp;addOption(java.lang.reflect.Field&nbsp;field,
                       <a href="../picocli/CommandLine.Help.IParamLabelRenderer.html" title="interface in picocli">CommandLine.Help.IParamLabelRenderer</a>&nbsp;paramLabelRenderer)</pre>
 <div class="block">Delegates to the <a href="../picocli/CommandLine.Help.Layout.html#optionRenderer"><code>option renderer</code></a> of this layout to obtain
- text values for the specified <a href="../picocli/CommandLine.Option.html" title="annotation in picocli"><code>CommandLine.Option</code></a>, and then calls the <code>#layout(Field, Text[][])</code>
+ text values for the specified <a href="../picocli/CommandLine.Option.html" title="annotation in picocli"><code>CommandLine.Option</code></a>, and then calls the <a href="../picocli/CommandLine.Help.Layout.html#layout-java.lang.reflect.Field-picocli.CommandLine.Help.Ansi.Text:A:A-"><code>layout(Field, CommandLine.Help.Ansi.Text[][])</code></a>
  method to write these text values into the correct cells in the TextTable.</div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
@@ -425,6 +446,11 @@ <h4>addPositionalParameters</h4>
 <pre>public&nbsp;void&nbsp;addPositionalParameters(java.util.List&lt;java.lang.reflect.Field&gt;&nbsp;fields,
                                     <a href="../picocli/CommandLine.Help.IParamLabelRenderer.html" title="interface in picocli">CommandLine.Help.IParamLabelRenderer</a>&nbsp;paramLabelRenderer)</pre>
 <div class="block">Calls <a href="../picocli/CommandLine.Help.Layout.html#addPositionalParameter-java.lang.reflect.Field-picocli.CommandLine.Help.IParamLabelRenderer-"><code>addPositionalParameter(Field, CommandLine.Help.IParamLabelRenderer)</code></a> for all non-hidden Parameters in the list.</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>fields</code> - fields annotated with <a href="../picocli/CommandLine.Parameters.html" title="annotation in picocli"><code>CommandLine.Parameters</code></a> to add usage descriptions for</dd>
+<dd><code>paramLabelRenderer</code> - knows how to render option parameters</dd>
+</dl>
 </li>
 </ul>
 <a name="addPositionalParameter-java.lang.reflect.Field-picocli.CommandLine.Help.IParamLabelRenderer-">
@@ -437,7 +463,7 @@ <h4>addPositionalParameter</h4>
                                    <a href="../picocli/CommandLine.Help.IParamLabelRenderer.html" title="interface in picocli">CommandLine.Help.IParamLabelRenderer</a>&nbsp;paramLabelRenderer)</pre>
 <div class="block">Delegates to the <a href="../picocli/CommandLine.Help.Layout.html#parameterRenderer"><code>parameter renderer</code></a> of this layout
  to obtain text values for the specified <a href="../picocli/CommandLine.Parameters.html" title="annotation in picocli"><code>CommandLine.Parameters</code></a>, and then calls
- <code>#layout(Field, Text[][])</code> to write these text values into the correct cells in the TextTable.</div>
+ <a href="../picocli/CommandLine.Help.Layout.html#layout-java.lang.reflect.Field-picocli.CommandLine.Help.Ansi.Text:A:A-"><code>layout(Field, CommandLine.Help.Ansi.Text[][])</code></a> to write these text values into the correct cells in the TextTable.</div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
 <dd><code>field</code> - the field annotated with the specified Parameters</dd>
diff --git a/docs/apidocs/picocli/CommandLine.Help.TextTable.html b/docs/apidocs/picocli/CommandLine.Help.TextTable.html
index 6db7d35d2..a9b755b6f 100644
--- a/docs/apidocs/picocli/CommandLine.Help.TextTable.html
+++ b/docs/apidocs/picocli/CommandLine.Help.TextTable.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_131) on Sun Apr 23 15:37:34 JST 2017 -->
-<title>CommandLine.Help.TextTable (picocli 0.9.3 API)</title>
-<meta name="date" content="2017-04-23">
+<!-- Generated by javadoc (1.8.0_131) on Thu May 04 10:49:39 JST 2017 -->
+<title>CommandLine.Help.TextTable (picocli 0.9.4 API)</title>
+<meta name="date" content="2017-05-04">
 <link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
 <script type="text/javascript" src="../script.js"></script>
 </head>
@@ -12,7 +12,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="CommandLine.Help.TextTable (picocli 0.9.3 API)";
+            parent.document.title="CommandLine.Help.TextTable (picocli 0.9.4 API)";
         }
     }
     catch(err) {
@@ -213,21 +213,21 @@ <h3>Method Summary</h3>
 <tr id="i1" class="rowColor">
 <td class="colFirst"><code>void</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Help.TextTable.html#addRowValues-picocli.CommandLine.Help.Ansi.Text...-">addRowValues</a></span>(<a href="../picocli/CommandLine.Help.Ansi.Text.html" title="class in picocli">CommandLine.Help.Ansi.Text</a>...&nbsp;values)</code>
-<div class="block">Adds a new <a href="../picocli/CommandLine.Help.TextTable.html#addEmptyRow--">empty row</a>, then calls <code>putValue</code> for each of the specified values, adding more empty rows
+<div class="block">Adds a new <a href="../picocli/CommandLine.Help.TextTable.html#addEmptyRow--">empty row</a>, then calls <a href="../picocli/CommandLine.Help.TextTable.html#putValue-int-int-picocli.CommandLine.Help.Ansi.Text-"><code>putValue</code></a> for each of the specified values, adding more empty rows
  if the return value indicates that the value spanned multiple columns or was wrapped to multiple rows.</div>
 </td>
 </tr>
 <tr id="i2" class="altColor">
 <td class="colFirst"><code>void</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Help.TextTable.html#addRowValues-java.lang.String...-">addRowValues</a></span>(java.lang.String...&nbsp;values)</code>
-<div class="block">Delegates to <code>#addRowValues(Text...)</code>.</div>
+<div class="block">Delegates to <a href="../picocli/CommandLine.Help.TextTable.html#addRowValues-picocli.CommandLine.Help.Ansi.Text...-"><code>addRowValues(CommandLine.Help.Ansi.Text...)</code></a>.</div>
 </td>
 </tr>
 <tr id="i3" class="rowColor">
 <td class="colFirst"><code><a href="../picocli/CommandLine.Help.Ansi.Text.html" title="class in picocli">CommandLine.Help.Ansi.Text</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Help.TextTable.html#cellAt-int-int-">cellAt</a></span>(int&nbsp;row,
       int&nbsp;col)</code>
-<div class="block">Returns the <code>char[]</code> slot at the specified row and column to write a text value into.</div>
+<div class="block">Returns the <code>Text</code> slot at the specified row and column to write a text value into.</div>
 </td>
 </tr>
 <tr id="i4" class="altColor">
@@ -355,6 +355,10 @@ <h4>TextTable</h4>
 <h4>TextTable</h4>
 <pre>public&nbsp;TextTable(<a href="../picocli/CommandLine.Help.Column.html" title="class in picocli">CommandLine.Help.Column</a>...&nbsp;columns)</pre>
 <div class="block">Constructs a <code>TextTable</code> with the specified columns.</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>columns</code> - columns to construct this TextTable with</dd>
+</dl>
 </li>
 </ul>
 </li>
@@ -373,7 +377,14 @@ <h3>Method Detail</h3>
 <h4>cellAt</h4>
 <pre>public&nbsp;<a href="../picocli/CommandLine.Help.Ansi.Text.html" title="class in picocli">CommandLine.Help.Ansi.Text</a>&nbsp;cellAt(int&nbsp;row,
                                          int&nbsp;col)</pre>
-<div class="block">Returns the <code>char[]</code> slot at the specified row and column to write a text value into.</div>
+<div class="block">Returns the <code>Text</code> slot at the specified row and column to write a text value into.</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>row</code> - the row of the cell whose Text to return</dd>
+<dd><code>col</code> - the column of the cell whose Text to return</dd>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd>the Text object at the specified row and column</dd>
+</dl>
 </li>
 </ul>
 <a name="rowCount--">
@@ -384,6 +395,10 @@ <h4>cellAt</h4>
 <h4>rowCount</h4>
 <pre>public&nbsp;int&nbsp;rowCount()</pre>
 <div class="block">Returns the current number of rows of this <code>TextTable</code>.</div>
+<dl>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd>the current number of rows in this TextTable</dd>
+</dl>
 </li>
 </ul>
 <a name="addEmptyRow--">
@@ -403,7 +418,11 @@ <h4>addEmptyRow</h4>
 <li class="blockList">
 <h4>addRowValues</h4>
 <pre>public&nbsp;void&nbsp;addRowValues(java.lang.String...&nbsp;values)</pre>
-<div class="block">Delegates to <code>#addRowValues(Text...)</code>.</div>
+<div class="block">Delegates to <a href="../picocli/CommandLine.Help.TextTable.html#addRowValues-picocli.CommandLine.Help.Ansi.Text...-"><code>addRowValues(CommandLine.Help.Ansi.Text...)</code></a>.</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>values</code> - the text values to display in each column of the current row</dd>
+</dl>
 </li>
 </ul>
 <a name="addRowValues-picocli.CommandLine.Help.Ansi.Text...-">
@@ -413,7 +432,7 @@ <h4>addRowValues</h4>
 <li class="blockList">
 <h4>addRowValues</h4>
 <pre>public&nbsp;void&nbsp;addRowValues(<a href="../picocli/CommandLine.Help.Ansi.Text.html" title="class in picocli">CommandLine.Help.Ansi.Text</a>...&nbsp;values)</pre>
-<div class="block">Adds a new <a href="../picocli/CommandLine.Help.TextTable.html#addEmptyRow--">empty row</a>, then calls <code>putValue</code> for each of the specified values, adding more empty rows
+<div class="block">Adds a new <a href="../picocli/CommandLine.Help.TextTable.html#addEmptyRow--">empty row</a>, then calls <a href="../picocli/CommandLine.Help.TextTable.html#putValue-int-int-picocli.CommandLine.Help.Ansi.Text-"><code>putValue</code></a> for each of the specified values, adding more empty rows
  if the return value indicates that the value spanned multiple columns or was wrapped to multiple rows.</div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
@@ -456,6 +475,12 @@ <h4>putValue</h4>
 <h4>toString</h4>
 <pre>public&nbsp;java.lang.StringBuilder&nbsp;toString(java.lang.StringBuilder&nbsp;text)</pre>
 <div class="block">Copies the text representation that we built up from the options into the specified StringBuilder.</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>text</code> - the StringBuilder to write into</dd>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd>the specified StringBuilder object (to allow method chaining and a more fluid API)</dd>
+</dl>
 </li>
 </ul>
 <a name="toString--">
diff --git a/docs/apidocs/picocli/CommandLine.Help.html b/docs/apidocs/picocli/CommandLine.Help.html
index 482a75b3e..c1db2b9cf 100644
--- a/docs/apidocs/picocli/CommandLine.Help.html
+++ b/docs/apidocs/picocli/CommandLine.Help.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_131) on Sun Apr 23 15:37:33 JST 2017 -->
-<title>CommandLine.Help (picocli 0.9.3 API)</title>
-<meta name="date" content="2017-04-23">
+<!-- Generated by javadoc (1.8.0_131) on Thu May 04 10:49:39 JST 2017 -->
+<title>CommandLine.Help (picocli 0.9.4 API)</title>
+<meta name="date" content="2017-05-04">
 <link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
 <script type="text/javascript" src="../script.js"></script>
 </head>
@@ -12,7 +12,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="CommandLine.Help (picocli 0.9.3 API)";
+            parent.document.title="CommandLine.Help (picocli 0.9.4 API)";
         }
     }
     catch(err) {
@@ -119,9 +119,9 @@ <h3>Layered API</h3>
  <p>The <a href="../picocli/CommandLine.Command.html" title="annotation in picocli"><code>CommandLine.Command</code></a> annotation provides the easiest way to customize usage help messages. See
  the <a href="https://remkop.github.io/picocli/index.html#_usage_help">Manual</a> for details.</p>
  <p>This Help class provides high-level functions to create sections of the usage help message and headings
- for these sections. Instead of calling the <code>CommandLine#usage(PrintStream, ColorScheme)</code> method,
- application authors may want to create a custom usage help message by reorganizing sections in a different order
- and/or adding custom sections.</p>
+ for these sections. Instead of calling the <a href="../picocli/CommandLine.html#usage-java.io.PrintStream-picocli.CommandLine.Help.ColorScheme-"><code>CommandLine.usage(PrintStream, CommandLine.Help.ColorScheme)</code></a>
+ method, application authors may want to create a custom usage help message by reorganizing sections in a
+ different order and/or adding custom sections.</p>
  <p>Finally, the Help class contains inner classes and interfaces that can be used to create custom help messages.</p>
  <h4>IOptionRenderer and IParameterRenderer</h4>
  <p>Renders a field annotated with <a href="../picocli/CommandLine.Option.html" title="annotation in picocli"><code>CommandLine.Option</code></a> or <a href="../picocli/CommandLine.Parameters.html" title="annotation in picocli"><code>CommandLine.Parameters</code></a> to an array of <a href="../picocli/CommandLine.Help.Ansi.Text.html" title="class in picocli"><code>CommandLine.Help.Ansi.Text</code></a> values.
@@ -557,7 +557,7 @@ <h3>Method Summary</h3>
 <td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.Help.html#join-java.lang.String:A-java.lang.StringBuilder-java.lang.Object...-">join</a></span>(java.lang.String[]&nbsp;values,
     java.lang.StringBuilder&nbsp;sb,
     java.lang.Object...&nbsp;params)</code>
-<div class="block">Appends each of the specified values plus the specified separator to the specified StringBuilder and returns it.</div>
+<div class="block">Formats each of the specified values and appends it to the specified StringBuilder.</div>
 </td>
 </tr>
 <tr id="i24" class="altColor">
@@ -888,6 +888,10 @@ <h4>Help</h4>
 <pre>public&nbsp;Help(java.lang.Object&nbsp;annotatedObject)</pre>
 <div class="block">Constructs a new <code>Help</code> instance with a default color scheme, initialized from annotatations
  on the specified class and superclasses.</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>annotatedObject</code> - the annotated object to create usage help for</dd>
+</dl>
 </li>
 </ul>
 <a name="Help-java.lang.Object-picocli.CommandLine.Help.ColorScheme-">
@@ -900,6 +904,11 @@ <h4>Help</h4>
             <a href="../picocli/CommandLine.Help.ColorScheme.html" title="class in picocli">CommandLine.Help.ColorScheme</a>&nbsp;colorScheme)</pre>
 <div class="block">Constructs a new <code>Help</code> instance with the specified color scheme, initialized from annotatations
  on the specified class and superclasses.</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>annotatedObject</code> - the annotated object to create usage help for</dd>
+<dd><code>colorScheme</code> - the color scheme to use</dd>
+</dl>
 </li>
 </ul>
 </li>
@@ -970,6 +979,10 @@ <h4>abbreviatedSynopsis</h4>
 <pre>public&nbsp;java.lang.String&nbsp;abbreviatedSynopsis()</pre>
 <div class="block">Generates a generic synopsis like <code>&lt;command name&gt; [OPTIONS] [PARAM1 [PARAM2]...]</code>, omitting parts
  that don't apply to the command (e.g., does not show [OPTIONS] if the command has no options).</div>
+<dl>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd>a generic synopsis</dd>
+</dl>
 </li>
 </ul>
 <a name="detailedSynopsis-java.util.Comparator-boolean-">
@@ -982,6 +995,13 @@ <h4>detailedSynopsis</h4>
                                          boolean&nbsp;clusterBooleanOptions)</pre>
 <div class="block">Generates a detailed synopsis message showing all options and parameters. Follows the unix convention of
  showing optional options and parameters in square brackets (<code>[ ]</code>).</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>optionSort</code> - comparator to sort options or <code>null</code> if options should not be sorted</dd>
+<dd><code>clusterBooleanOptions</code> - <code>true</code> if boolean short options should be clustered into a single string</dd>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd>a detailed synopsis</dd>
+</dl>
 </li>
 </ul>
 <a name="optionList--">
@@ -1066,7 +1086,15 @@ <h4>join</h4>
 <pre>public static&nbsp;java.lang.StringBuilder&nbsp;join(java.lang.String[]&nbsp;values,
                                            java.lang.StringBuilder&nbsp;sb,
                                            java.lang.Object...&nbsp;params)</pre>
-<div class="block">Appends each of the specified values plus the specified separator to the specified StringBuilder and returns it.</div>
+<div class="block">Formats each of the specified values and appends it to the specified StringBuilder.</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>values</code> - the values to format and append to the StringBuilder</dd>
+<dd><code>sb</code> - the StringBuilder to collect the formatted strings</dd>
+<dd><code>params</code> - the parameters to pass to the format method when formatting each value</dd>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd>the specified StringBuilder</dd>
+</dl>
 </li>
 </ul>
 <a name="customSynopsis-java.lang.Object...-">
@@ -1149,6 +1177,12 @@ <h4>footer</h4>
 <h4>headerHeading</h4>
 <pre>public&nbsp;java.lang.String&nbsp;headerHeading(java.lang.Object...&nbsp;params)</pre>
 <div class="block">Returns the text displayed before the header text; the result of <code>String.format(headerHeading, params)</code>.</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>params</code> - the parameters to use to format the header heading</dd>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd>the formatted header heading</dd>
+</dl>
 </li>
 </ul>
 <a name="synopsisHeading-java.lang.Object...-">
@@ -1159,6 +1193,12 @@ <h4>headerHeading</h4>
 <h4>synopsisHeading</h4>
 <pre>public&nbsp;java.lang.String&nbsp;synopsisHeading(java.lang.Object...&nbsp;params)</pre>
 <div class="block">Returns the text displayed before the synopsis text; the result of <code>String.format(synopsisHeading, params)</code>.</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>params</code> - the parameters to use to format the synopsis heading</dd>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd>the formatted synopsis heading</dd>
+</dl>
 </li>
 </ul>
 <a name="descriptionHeading-java.lang.Object...-">
@@ -1170,6 +1210,12 @@ <h4>descriptionHeading</h4>
 <pre>public&nbsp;java.lang.String&nbsp;descriptionHeading(java.lang.Object...&nbsp;params)</pre>
 <div class="block">Returns the text displayed before the description text; an empty string if there is no description,
  otherwise the result of <code>String.format(descriptionHeading, params)</code>.</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>params</code> - the parameters to use to format the description heading</dd>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd>the formatted description heading</dd>
+</dl>
 </li>
 </ul>
 <a name="parameterListHeading-java.lang.Object...-">
@@ -1181,6 +1227,12 @@ <h4>parameterListHeading</h4>
 <pre>public&nbsp;java.lang.String&nbsp;parameterListHeading(java.lang.Object...&nbsp;params)</pre>
 <div class="block">Returns the text displayed before the positional parameter list; an empty string if there are no positional
  parameters, otherwise the result of <code>String.format(parameterListHeading, params)</code>.</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>params</code> - the parameters to use to format the parameter list heading</dd>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd>the formatted parameter list heading</dd>
+</dl>
 </li>
 </ul>
 <a name="optionListHeading-java.lang.Object...-">
@@ -1192,6 +1244,12 @@ <h4>optionListHeading</h4>
 <pre>public&nbsp;java.lang.String&nbsp;optionListHeading(java.lang.Object...&nbsp;params)</pre>
 <div class="block">Returns the text displayed before the option list; an empty string if there are no options,
  otherwise the result of <code>String.format(optionListHeading, params)</code>.</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>params</code> - the parameters to use to format the option list heading</dd>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd>the formatted option list heading</dd>
+</dl>
 </li>
 </ul>
 <a name="commandListHeading-java.lang.Object...-">
@@ -1203,6 +1261,12 @@ <h4>commandListHeading</h4>
 <pre>public&nbsp;java.lang.String&nbsp;commandListHeading(java.lang.Object...&nbsp;params)</pre>
 <div class="block">Returns the text displayed before the command list; an empty string if there are no commands,
  otherwise the result of <code>String.format(commandListHeading, params)</code>.</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>params</code> - the parameters to use to format the command list heading</dd>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd>the formatted command list heading</dd>
+</dl>
 </li>
 </ul>
 <a name="footerHeading-java.lang.Object...-">
@@ -1213,6 +1277,12 @@ <h4>commandListHeading</h4>
 <h4>footerHeading</h4>
 <pre>public&nbsp;java.lang.String&nbsp;footerHeading(java.lang.Object...&nbsp;params)</pre>
 <div class="block">Returns the text displayed before the footer text; the result of <code>String.format(footerHeading, params)</code>.</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>params</code> - the parameters to use to format the footer heading</dd>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd>the formatted footer heading</dd>
+</dl>
 </li>
 </ul>
 <a name="commandList--">
@@ -1223,6 +1293,10 @@ <h4>footerHeading</h4>
 <h4>commandList</h4>
 <pre>public&nbsp;java.lang.String&nbsp;commandList()</pre>
 <div class="block">Returns a 2-column list with command names and the first line of their header or (if absent) description.</div>
+<dl>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd>a usage help section describing the added commands</dd>
+</dl>
 </li>
 </ul>
 <a name="createDefaultLayout--">
@@ -1233,6 +1307,10 @@ <h4>commandList</h4>
 <h4>createDefaultLayout</h4>
 <pre>public&nbsp;<a href="../picocli/CommandLine.Help.Layout.html" title="class in picocli">CommandLine.Help.Layout</a>&nbsp;createDefaultLayout()</pre>
 <div class="block">Returns a <code>Layout</code> instance configured with the user preferences captured in this Help instance.</div>
+<dl>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd>a Layout</dd>
+</dl>
 </li>
 </ul>
 <a name="createDefaultOptionRenderer--">
@@ -1253,6 +1331,10 @@ <h4>createDefaultOptionRenderer</h4>
  </ol>
  <p>Following this, there will be one row for each of the remaining elements of the <a href="../picocli/CommandLine.Option.html#description--"><code>CommandLine.Option.description()</code></a> array, and these rows look like <code>{"", "", "", "", option.description()[i]}</code>.</p>
  <p>If configured, this option renderer adds an additional row to display the default field value.</p></div>
+<dl>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd>a new default OptionRenderer</dd>
+</dl>
 </li>
 </ul>
 <a name="createMinimalOptionRenderer--">
@@ -1264,6 +1346,10 @@ <h4>createMinimalOptionRenderer</h4>
 <pre>public static&nbsp;<a href="../picocli/CommandLine.Help.IOptionRenderer.html" title="interface in picocli">CommandLine.Help.IOptionRenderer</a>&nbsp;createMinimalOptionRenderer()</pre>
 <div class="block">Returns a new minimal OptionRenderer which converts <a href="../picocli/CommandLine.Option.html" title="annotation in picocli"><code>Options</code></a> to a single row with two columns
  of text: an option name and a description. If multiple names or descriptions exist, the first value is used.</div>
+<dl>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd>a new minimal OptionRenderer</dd>
+</dl>
 </li>
 </ul>
 <a name="createDefaultParameterRenderer--">
@@ -1283,6 +1369,10 @@ <h4>createDefaultParameterRenderer</h4>
  </ol>
  <p>Following this, there will be one row for each of the remaining elements of the <a href="../picocli/CommandLine.Parameters.html#description--"><code>CommandLine.Parameters.description()</code></a> array, and these rows look like <code>{"", "", "", param.description()[i]}</code>.</p>
  <p>If configured, this parameter renderer adds an additional row to display the default field value.</p></div>
+<dl>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd>a new default ParameterRenderer</dd>
+</dl>
 </li>
 </ul>
 <a name="createMinimalParameterRenderer--">
@@ -1294,6 +1384,10 @@ <h4>createMinimalParameterRenderer</h4>
 <pre>public static&nbsp;<a href="../picocli/CommandLine.Help.IParameterRenderer.html" title="interface in picocli">CommandLine.Help.IParameterRenderer</a>&nbsp;createMinimalParameterRenderer()</pre>
 <div class="block">Returns a new minimal ParameterRenderer which converts <a href="../picocli/CommandLine.Parameters.html" title="annotation in picocli"><code>Parameters</code></a> to a single row with
  two columns of text: an option name and a description. If multiple descriptions exist, the first value is used.</div>
+<dl>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd>a new minimal ParameterRenderer</dd>
+</dl>
 </li>
 </ul>
 <a name="createMinimalParamLabelRenderer--">
@@ -1304,6 +1398,10 @@ <h4>createMinimalParameterRenderer</h4>
 <h4>createMinimalParamLabelRenderer</h4>
 <pre>public static&nbsp;<a href="../picocli/CommandLine.Help.IParamLabelRenderer.html" title="interface in picocli">CommandLine.Help.IParamLabelRenderer</a>&nbsp;createMinimalParamLabelRenderer()</pre>
 <div class="block">Returns a value renderer that returns the <code>paramLabel</code> if defined or the field name otherwise.</div>
+<dl>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd>a new minimal ParamLabelRenderer</dd>
+</dl>
 </li>
 </ul>
 <a name="createDefaultParamLabelRenderer--">
@@ -1315,6 +1413,10 @@ <h4>createDefaultParamLabelRenderer</h4>
 <pre>public&nbsp;<a href="../picocli/CommandLine.Help.IParamLabelRenderer.html" title="interface in picocli">CommandLine.Help.IParamLabelRenderer</a>&nbsp;createDefaultParamLabelRenderer()</pre>
 <div class="block">Returns a new default value renderer that separates option parameters from their <a href="../picocli/CommandLine.Option.html" title="annotation in picocli">options</a> with the specified separator string, surrounds optional parameters with <code>'['</code> and <code>']'</code>
  characters and uses ellipses ("...") to indicate that any number of a parameter are allowed.</div>
+<dl>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd>a new default ParamLabelRenderer</dd>
+</dl>
 </li>
 </ul>
 <a name="createShortOptionNameComparator--">
@@ -1326,6 +1428,10 @@ <h4>createShortOptionNameComparator</h4>
 <pre>public static&nbsp;java.util.Comparator&lt;java.lang.reflect.Field&gt;&nbsp;createShortOptionNameComparator()</pre>
 <div class="block">Sorts Fields annotated with <code>Option</code> by their option name in case-insensitive alphabetic order. If an
  Option has multiple names, the shortest name is used for the sorting. Help options follow non-help options.</div>
+<dl>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd>a comparator that sorts fields by their option name in case-insensitive alphabetic order</dd>
+</dl>
 </li>
 </ul>
 <a name="createShortOptionArityAndNameComparator--">
@@ -1337,6 +1443,10 @@ <h4>createShortOptionArityAndNameComparator</h4>
 <pre>public static&nbsp;java.util.Comparator&lt;java.lang.reflect.Field&gt;&nbsp;createShortOptionArityAndNameComparator()</pre>
 <div class="block">Sorts Fields annotated with <code>Option</code> by their option <a href="../picocli/CommandLine.Arity.html#max">max arity</a> first, by
  <a href="../picocli/CommandLine.Arity.html#min">min arity</a> next, and by <a href="../picocli/CommandLine.Help.html#createShortOptionNameComparator--">option name</a> last.</div>
+<dl>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd>a comparator that sorts fields by arity first, then their option name</dd>
+</dl>
 </li>
 </ul>
 <a name="shortestFirst--">
@@ -1347,6 +1457,10 @@ <h4>createShortOptionArityAndNameComparator</h4>
 <h4>shortestFirst</h4>
 <pre>public static&nbsp;java.util.Comparator&lt;java.lang.String&gt;&nbsp;shortestFirst()</pre>
 <div class="block">Sorts short strings before longer strings.</div>
+<dl>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd>a comparators that sorts short strings before longer strings</dd>
+</dl>
 </li>
 </ul>
 <a name="defaultColorScheme--">
diff --git a/docs/apidocs/picocli/CommandLine.ITypeConverter.html b/docs/apidocs/picocli/CommandLine.ITypeConverter.html
index c847dc85f..7b9f06180 100644
--- a/docs/apidocs/picocli/CommandLine.ITypeConverter.html
+++ b/docs/apidocs/picocli/CommandLine.ITypeConverter.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_131) on Sun Apr 23 15:37:34 JST 2017 -->
-<title>CommandLine.ITypeConverter (picocli 0.9.3 API)</title>
-<meta name="date" content="2017-04-23">
+<!-- Generated by javadoc (1.8.0_131) on Thu May 04 10:49:39 JST 2017 -->
+<title>CommandLine.ITypeConverter (picocli 0.9.4 API)</title>
+<meta name="date" content="2017-05-04">
 <link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
 <script type="text/javascript" src="../script.js"></script>
 </head>
@@ -12,7 +12,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="CommandLine.ITypeConverter (picocli 0.9.3 API)";
+            parent.document.title="CommandLine.ITypeConverter (picocli 0.9.4 API)";
         }
     }
     catch(err) {
diff --git a/docs/apidocs/picocli/CommandLine.MissingParameterException.html b/docs/apidocs/picocli/CommandLine.MissingParameterException.html
index 7584a1209..40d43b38c 100644
--- a/docs/apidocs/picocli/CommandLine.MissingParameterException.html
+++ b/docs/apidocs/picocli/CommandLine.MissingParameterException.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_131) on Sun Apr 23 15:37:34 JST 2017 -->
-<title>CommandLine.MissingParameterException (picocli 0.9.3 API)</title>
-<meta name="date" content="2017-04-23">
+<!-- Generated by javadoc (1.8.0_131) on Thu May 04 10:49:39 JST 2017 -->
+<title>CommandLine.MissingParameterException (picocli 0.9.4 API)</title>
+<meta name="date" content="2017-05-04">
 <link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
 <script type="text/javascript" src="../script.js"></script>
 </head>
@@ -12,7 +12,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="CommandLine.MissingParameterException (picocli 0.9.3 API)";
+            parent.document.title="CommandLine.MissingParameterException (picocli 0.9.4 API)";
         }
     }
     catch(err) {
diff --git a/docs/apidocs/picocli/CommandLine.MissingTypeConverterException.html b/docs/apidocs/picocli/CommandLine.MissingTypeConverterException.html
index 1586ba28b..6d980886d 100644
--- a/docs/apidocs/picocli/CommandLine.MissingTypeConverterException.html
+++ b/docs/apidocs/picocli/CommandLine.MissingTypeConverterException.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_131) on Sun Apr 23 15:37:34 JST 2017 -->
-<title>CommandLine.MissingTypeConverterException (picocli 0.9.3 API)</title>
-<meta name="date" content="2017-04-23">
+<!-- Generated by javadoc (1.8.0_131) on Thu May 04 10:49:39 JST 2017 -->
+<title>CommandLine.MissingTypeConverterException (picocli 0.9.4 API)</title>
+<meta name="date" content="2017-05-04">
 <link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
 <script type="text/javascript" src="../script.js"></script>
 </head>
@@ -12,7 +12,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="CommandLine.MissingTypeConverterException (picocli 0.9.3 API)";
+            parent.document.title="CommandLine.MissingTypeConverterException (picocli 0.9.4 API)";
         }
     }
     catch(err) {
diff --git a/docs/apidocs/picocli/CommandLine.Option.html b/docs/apidocs/picocli/CommandLine.Option.html
index c5875d4a4..9a2ba1014 100644
--- a/docs/apidocs/picocli/CommandLine.Option.html
+++ b/docs/apidocs/picocli/CommandLine.Option.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_131) on Sun Apr 23 15:37:34 JST 2017 -->
-<title>CommandLine.Option (picocli 0.9.3 API)</title>
-<meta name="date" content="2017-04-23">
+<!-- Generated by javadoc (1.8.0_131) on Thu May 04 10:49:39 JST 2017 -->
+<title>CommandLine.Option (picocli 0.9.4 API)</title>
+<meta name="date" content="2017-05-04">
 <link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
 <script type="text/javascript" src="../script.js"></script>
 </head>
@@ -12,7 +12,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="CommandLine.Option (picocli 0.9.3 API)";
+            parent.document.title="CommandLine.Option (picocli 0.9.4 API)";
         }
     }
     catch(err) {
diff --git a/docs/apidocs/picocli/CommandLine.ParameterException.html b/docs/apidocs/picocli/CommandLine.ParameterException.html
index 234df58ad..3b16531c5 100644
--- a/docs/apidocs/picocli/CommandLine.ParameterException.html
+++ b/docs/apidocs/picocli/CommandLine.ParameterException.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_131) on Sun Apr 23 15:37:34 JST 2017 -->
-<title>CommandLine.ParameterException (picocli 0.9.3 API)</title>
-<meta name="date" content="2017-04-23">
+<!-- Generated by javadoc (1.8.0_131) on Thu May 04 10:49:39 JST 2017 -->
+<title>CommandLine.ParameterException (picocli 0.9.4 API)</title>
+<meta name="date" content="2017-05-04">
 <link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
 <script type="text/javascript" src="../script.js"></script>
 </head>
@@ -12,7 +12,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="CommandLine.ParameterException (picocli 0.9.3 API)";
+            parent.document.title="CommandLine.ParameterException (picocli 0.9.4 API)";
         }
     }
     catch(err) {
diff --git a/docs/apidocs/picocli/CommandLine.Parameters.html b/docs/apidocs/picocli/CommandLine.Parameters.html
index 27146a80f..990c01c06 100644
--- a/docs/apidocs/picocli/CommandLine.Parameters.html
+++ b/docs/apidocs/picocli/CommandLine.Parameters.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_131) on Sun Apr 23 15:37:34 JST 2017 -->
-<title>CommandLine.Parameters (picocli 0.9.3 API)</title>
-<meta name="date" content="2017-04-23">
+<!-- Generated by javadoc (1.8.0_131) on Thu May 04 10:49:39 JST 2017 -->
+<title>CommandLine.Parameters (picocli 0.9.4 API)</title>
+<meta name="date" content="2017-05-04">
 <link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
 <script type="text/javascript" src="../script.js"></script>
 </head>
@@ -12,7 +12,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="CommandLine.Parameters (picocli 0.9.3 API)";
+            parent.document.title="CommandLine.Parameters (picocli 0.9.4 API)";
         }
     }
     catch(err) {
diff --git a/docs/apidocs/picocli/CommandLine.html b/docs/apidocs/picocli/CommandLine.html
index e8fb3c4e4..573948cf8 100644
--- a/docs/apidocs/picocli/CommandLine.html
+++ b/docs/apidocs/picocli/CommandLine.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_131) on Sun Apr 23 15:37:33 JST 2017 -->
-<title>CommandLine (picocli 0.9.3 API)</title>
-<meta name="date" content="2017-04-23">
+<!-- Generated by javadoc (1.8.0_131) on Thu May 04 10:49:38 JST 2017 -->
+<title>CommandLine (picocli 0.9.4 API)</title>
+<meta name="date" content="2017-05-04">
 <link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
 <script type="text/javascript" src="../script.js"></script>
 </head>
@@ -12,7 +12,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="CommandLine (picocli 0.9.3 API)";
+            parent.document.title="CommandLine (picocli 0.9.4 API)";
         }
     }
     catch(err) {
@@ -273,7 +273,7 @@ <h3>Field Summary</h3>
 <tr class="rowColor">
 <td class="colFirst"><code>static java.lang.String</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.html#VERSION">VERSION</a></span></code>
-<div class="block">This is picocli version "0.9.3".</div>
+<div class="block">This is picocli version "0.9.4".</div>
 </td>
 </tr>
 </table>
@@ -320,13 +320,13 @@ <h3>Method Summary</h3>
 <tr id="i1" class="rowColor">
 <td class="colFirst"><code>java.util.Map&lt;java.lang.String,java.lang.Object&gt;</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.html#getCommands--">getCommands</a></span>()</code>
-<div class="block">Returns a map with the registered sub-commands.</div>
+<div class="block">Returns a map with the <a href="../picocli/CommandLine.html#addCommand-java.lang.String-java.lang.Object-">registered</a> sub-commands.</div>
 </td>
 </tr>
 <tr id="i2" class="altColor">
 <td class="colFirst"><code>java.lang.String</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.html#getSeparator--">getSeparator</a></span>()</code>
-<div class="block">Returns the String that separates option names from option values.</div>
+<div class="block">Returns the String that separates option names from option values when parsing command line options.</div>
 </td>
 </tr>
 <tr id="i3" class="rowColor">
@@ -364,7 +364,7 @@ <h3>Method Summary</h3>
 <tr id="i7" class="rowColor">
 <td class="colFirst"><code>void</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../picocli/CommandLine.html#setSeparator-java.lang.String-">setSeparator</a></span>(java.lang.String&nbsp;separator)</code>
-<div class="block">Sets the String that separates option names from option values to the specified value.</div>
+<div class="block">Sets the String the parser uses to separate option names from option values to the specified value.</div>
 </td>
 </tr>
 <tr id="i8" class="altColor">
@@ -424,7 +424,7 @@ <h3>Field Detail</h3>
 <li class="blockList">
 <h4>VERSION</h4>
 <pre>public static final&nbsp;java.lang.String VERSION</pre>
-<div class="block">This is picocli version "0.9.3".</div>
+<div class="block">This is picocli version "0.9.4".</div>
 <dl>
 <dt><span class="seeLabel">See Also:</span></dt>
 <dd><a href="../constant-values.html#picocli.CommandLine.VERSION">Constant Field Values</a></dd>
@@ -499,7 +499,11 @@ <h4>addCommand</h4>
 <li class="blockList">
 <h4>getCommands</h4>
 <pre>public&nbsp;java.util.Map&lt;java.lang.String,java.lang.Object&gt;&nbsp;getCommands()</pre>
-<div class="block">Returns a map with the registered sub-commands.</div>
+<div class="block">Returns a map with the <a href="../picocli/CommandLine.html#addCommand-java.lang.String-java.lang.Object-">registered</a> sub-commands.</div>
+<dl>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd>a map with the registered sub-commands</dd>
+</dl>
 </li>
 </ul>
 <a name="parse-java.lang.Object-java.lang.String:A-">
@@ -743,7 +747,11 @@ <h4>registerConverter</h4>
 <li class="blockList">
 <h4>getSeparator</h4>
 <pre>public&nbsp;java.lang.String&nbsp;getSeparator()</pre>
-<div class="block">Returns the String that separates option names from option values. <code>'='</code> by default.</div>
+<div class="block">Returns the String that separates option names from option values when parsing command line options. <code>'='</code> by default.</div>
+<dl>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd>the String the parser uses to separate option names from option values</dd>
+</dl>
 </li>
 </ul>
 <a name="setSeparator-java.lang.String-">
@@ -753,7 +761,11 @@ <h4>getSeparator</h4>
 <li class="blockList">
 <h4>setSeparator</h4>
 <pre>public&nbsp;void&nbsp;setSeparator(java.lang.String&nbsp;separator)</pre>
-<div class="block">Sets the String that separates option names from option values to the specified value.</div>
+<div class="block">Sets the String the parser uses to separate option names from option values to the specified value.</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>separator</code> - the String that separates option names from option values</dd>
+</dl>
 </li>
 </ul>
 </li>
diff --git a/docs/apidocs/picocli/class-use/CommandLine.Arity.html b/docs/apidocs/picocli/class-use/CommandLine.Arity.html
deleted file mode 100644
index b1f46436b..000000000
--- a/docs/apidocs/picocli/class-use/CommandLine.Arity.html
+++ /dev/null
@@ -1,170 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- NewPage -->
-<html lang="en">
-<head>
-<!-- Generated by javadoc (1.8.0_51) on Wed Apr 19 00:59:45 JST 2017 -->
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Uses of Class picocli.CommandLine.Arity (picocli 0.9.1 API)</title>
-<meta name="date" content="2017-04-19">
-<link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
-<script type="text/javascript" src="../../script.js"></script>
-</head>
-<body>
-<script type="text/javascript"><!--
-    try {
-        if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Uses of Class picocli.CommandLine.Arity (picocli 0.9.1 API)";
-        }
-    }
-    catch(err) {
-    }
-//-->
-</script>
-<noscript>
-<div>JavaScript is disabled on your browser.</div>
-</noscript>
-<!-- ========= START OF TOP NAVBAR ======= -->
-<div class="topNav"><a name="navbar.top">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.top.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../../picocli/package-summary.html">Package</a></li>
-<li><a href="../../picocli/CommandLine.Arity.html" title="class in picocli">Class</a></li>
-<li class="navBarCell1Rev">Use</li>
-<li><a href="../package-tree.html">Tree</a></li>
-<li><a href="../../deprecated-list.html">Deprecated</a></li>
-<li><a href="../../index-all.html">Index</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li>Prev</li>
-<li>Next</li>
-</ul>
-<ul class="navList">
-<li><a href="../../index.html?picocli/class-use/CommandLine.Arity.html" target="_top">Frames</a></li>
-<li><a href="CommandLine.Arity.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_top">
-<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_top");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<a name="skip.navbar.top">
-<!--   -->
-</a></div>
-<!-- ========= END OF TOP NAVBAR ========= -->
-<div class="header">
-<h2 title="Uses of Class picocli.CommandLine.Arity" class="title">Uses of Class<br>picocli.CommandLine.Arity</h2>
-</div>
-<div class="classUseContainer">
-<ul class="blockList">
-<li class="blockList">
-<ul class="blockList">
-<li class="blockList"><a name="picocli">
-<!--   -->
-</a>
-<h3>Uses of <a href="../../picocli/CommandLine.Arity.html" title="class in picocli">CommandLine.Arity</a> in <a href="../../picocli/package-summary.html">picocli</a></h3>
-<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing methods, and an explanation">
-<caption><span>Methods in <a href="../../picocli/package-summary.html">picocli</a> that return <a href="../../picocli/CommandLine.Arity.html" title="class in picocli">CommandLine.Arity</a></span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colFirst" scope="col">Modifier and Type</th>
-<th class="colLast" scope="col">Method and Description</th>
-</tr>
-<tbody>
-<tr class="altColor">
-<td class="colFirst"><code>static <a href="../../picocli/CommandLine.Arity.html" title="class in picocli">CommandLine.Arity</a></code></td>
-<td class="colLast"><span class="typeNameLabel">CommandLine.Arity.</span><code><span class="memberNameLink"><a href="../../picocli/CommandLine.Arity.html#forOption-java.lang.reflect.Field-">forOption</a></span>(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/reflect/Field.html?is-external=true" title="class or interface in java.lang.reflect">Field</a>&nbsp;field)</code>
-<div class="block">Returns a new <code>Arity</code> based on the Option annotation on the specified field, or the field type if no
- arity was specified.</div>
-</td>
-</tr>
-<tr class="rowColor">
-<td class="colFirst"><code>static <a href="../../picocli/CommandLine.Arity.html" title="class in picocli">CommandLine.Arity</a></code></td>
-<td class="colLast"><span class="typeNameLabel">CommandLine.Arity.</span><code><span class="memberNameLink"><a href="../../picocli/CommandLine.Arity.html#forParameters-java.lang.reflect.Field-">forParameters</a></span>(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/reflect/Field.html?is-external=true" title="class or interface in java.lang.reflect">Field</a>&nbsp;field)</code>
-<div class="block">Returns a new <code>Arity</code> based on the Parameters annotation on the specified field, or the field type
- if no arity was specified.</div>
-</td>
-</tr>
-<tr class="altColor">
-<td class="colFirst"><code>static <a href="../../picocli/CommandLine.Arity.html" title="class in picocli">CommandLine.Arity</a></code></td>
-<td class="colLast"><span class="typeNameLabel">CommandLine.Arity.</span><code><span class="memberNameLink"><a href="../../picocli/CommandLine.Arity.html#forType-java.lang.Class-">forType</a></span>(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a>&lt;?&gt;&nbsp;type)</code>
-<div class="block">Returns a new <code>Arity</code> based on the specified type: booleans have arity 0, arrays or Collections have
- arity "0..*", and other types have arity 1.</div>
-</td>
-</tr>
-<tr class="rowColor">
-<td class="colFirst"><code>static <a href="../../picocli/CommandLine.Arity.html" title="class in picocli">CommandLine.Arity</a></code></td>
-<td class="colLast"><span class="typeNameLabel">CommandLine.Arity.</span><code><span class="memberNameLink"><a href="../../picocli/CommandLine.Arity.html#valueOf-java.lang.String-">valueOf</a></span>(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;arity)</code>
-<div class="block">Leniently parses the specified String as an <code>Arity</code> value and return the result.</div>
-</td>
-</tr>
-</tbody>
-</table>
-</li>
-</ul>
-</li>
-</ul>
-</div>
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<div class="bottomNav"><a name="navbar.bottom">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.bottom.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../../picocli/package-summary.html">Package</a></li>
-<li><a href="../../picocli/CommandLine.Arity.html" title="class in picocli">Class</a></li>
-<li class="navBarCell1Rev">Use</li>
-<li><a href="../package-tree.html">Tree</a></li>
-<li><a href="../../deprecated-list.html">Deprecated</a></li>
-<li><a href="../../index-all.html">Index</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li>Prev</li>
-<li>Next</li>
-</ul>
-<ul class="navList">
-<li><a href="../../index.html?picocli/class-use/CommandLine.Arity.html" target="_top">Frames</a></li>
-<li><a href="CommandLine.Arity.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_bottom">
-<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_bottom");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<a name="skip.navbar.bottom">
-<!--   -->
-</a></div>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-<p class="legalCopy"><small>Copyright &#169; 2017. All rights reserved.</small></p>
-</body>
-</html>
diff --git a/docs/apidocs/picocli/class-use/CommandLine.Command.html b/docs/apidocs/picocli/class-use/CommandLine.Command.html
deleted file mode 100644
index 8e68d2e0b..000000000
--- a/docs/apidocs/picocli/class-use/CommandLine.Command.html
+++ /dev/null
@@ -1,122 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- NewPage -->
-<html lang="en">
-<head>
-<!-- Generated by javadoc (1.8.0_51) on Wed Apr 19 00:59:45 JST 2017 -->
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Uses of Class picocli.CommandLine.Command (picocli 0.9.1 API)</title>
-<meta name="date" content="2017-04-19">
-<link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
-<script type="text/javascript" src="../../script.js"></script>
-</head>
-<body>
-<script type="text/javascript"><!--
-    try {
-        if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Uses of Class picocli.CommandLine.Command (picocli 0.9.1 API)";
-        }
-    }
-    catch(err) {
-    }
-//-->
-</script>
-<noscript>
-<div>JavaScript is disabled on your browser.</div>
-</noscript>
-<!-- ========= START OF TOP NAVBAR ======= -->
-<div class="topNav"><a name="navbar.top">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.top.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../../picocli/package-summary.html">Package</a></li>
-<li><a href="../../picocli/CommandLine.Command.html" title="annotation in picocli">Class</a></li>
-<li class="navBarCell1Rev">Use</li>
-<li><a href="../package-tree.html">Tree</a></li>
-<li><a href="../../deprecated-list.html">Deprecated</a></li>
-<li><a href="../../index-all.html">Index</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li>Prev</li>
-<li>Next</li>
-</ul>
-<ul class="navList">
-<li><a href="../../index.html?picocli/class-use/CommandLine.Command.html" target="_top">Frames</a></li>
-<li><a href="CommandLine.Command.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_top">
-<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_top");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<a name="skip.navbar.top">
-<!--   -->
-</a></div>
-<!-- ========= END OF TOP NAVBAR ========= -->
-<div class="header">
-<h2 title="Uses of Class picocli.CommandLine.Command" class="title">Uses of Class<br>picocli.CommandLine.Command</h2>
-</div>
-<div class="classUseContainer">No usage of picocli.CommandLine.Command</div>
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<div class="bottomNav"><a name="navbar.bottom">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.bottom.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../../picocli/package-summary.html">Package</a></li>
-<li><a href="../../picocli/CommandLine.Command.html" title="annotation in picocli">Class</a></li>
-<li class="navBarCell1Rev">Use</li>
-<li><a href="../package-tree.html">Tree</a></li>
-<li><a href="../../deprecated-list.html">Deprecated</a></li>
-<li><a href="../../index-all.html">Index</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li>Prev</li>
-<li>Next</li>
-</ul>
-<ul class="navList">
-<li><a href="../../index.html?picocli/class-use/CommandLine.Command.html" target="_top">Frames</a></li>
-<li><a href="CommandLine.Command.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_bottom">
-<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_bottom");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<a name="skip.navbar.bottom">
-<!--   -->
-</a></div>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-<p class="legalCopy"><small>Copyright &#169; 2017. All rights reserved.</small></p>
-</body>
-</html>
diff --git a/docs/apidocs/picocli/class-use/CommandLine.DuplicateOptionAnnotationsException.html b/docs/apidocs/picocli/class-use/CommandLine.DuplicateOptionAnnotationsException.html
deleted file mode 100644
index 27000e348..000000000
--- a/docs/apidocs/picocli/class-use/CommandLine.DuplicateOptionAnnotationsException.html
+++ /dev/null
@@ -1,122 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- NewPage -->
-<html lang="en">
-<head>
-<!-- Generated by javadoc (1.8.0_51) on Wed Apr 19 00:59:45 JST 2017 -->
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Uses of Class picocli.CommandLine.DuplicateOptionAnnotationsException (picocli 0.9.1 API)</title>
-<meta name="date" content="2017-04-19">
-<link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
-<script type="text/javascript" src="../../script.js"></script>
-</head>
-<body>
-<script type="text/javascript"><!--
-    try {
-        if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Uses of Class picocli.CommandLine.DuplicateOptionAnnotationsException (picocli 0.9.1 API)";
-        }
-    }
-    catch(err) {
-    }
-//-->
-</script>
-<noscript>
-<div>JavaScript is disabled on your browser.</div>
-</noscript>
-<!-- ========= START OF TOP NAVBAR ======= -->
-<div class="topNav"><a name="navbar.top">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.top.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../../picocli/package-summary.html">Package</a></li>
-<li><a href="../../picocli/CommandLine.DuplicateOptionAnnotationsException.html" title="class in picocli">Class</a></li>
-<li class="navBarCell1Rev">Use</li>
-<li><a href="../package-tree.html">Tree</a></li>
-<li><a href="../../deprecated-list.html">Deprecated</a></li>
-<li><a href="../../index-all.html">Index</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li>Prev</li>
-<li>Next</li>
-</ul>
-<ul class="navList">
-<li><a href="../../index.html?picocli/class-use/CommandLine.DuplicateOptionAnnotationsException.html" target="_top">Frames</a></li>
-<li><a href="CommandLine.DuplicateOptionAnnotationsException.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_top">
-<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_top");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<a name="skip.navbar.top">
-<!--   -->
-</a></div>
-<!-- ========= END OF TOP NAVBAR ========= -->
-<div class="header">
-<h2 title="Uses of Class picocli.CommandLine.DuplicateOptionAnnotationsException" class="title">Uses of Class<br>picocli.CommandLine.DuplicateOptionAnnotationsException</h2>
-</div>
-<div class="classUseContainer">No usage of picocli.CommandLine.DuplicateOptionAnnotationsException</div>
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<div class="bottomNav"><a name="navbar.bottom">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.bottom.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../../picocli/package-summary.html">Package</a></li>
-<li><a href="../../picocli/CommandLine.DuplicateOptionAnnotationsException.html" title="class in picocli">Class</a></li>
-<li class="navBarCell1Rev">Use</li>
-<li><a href="../package-tree.html">Tree</a></li>
-<li><a href="../../deprecated-list.html">Deprecated</a></li>
-<li><a href="../../index-all.html">Index</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li>Prev</li>
-<li>Next</li>
-</ul>
-<ul class="navList">
-<li><a href="../../index.html?picocli/class-use/CommandLine.DuplicateOptionAnnotationsException.html" target="_top">Frames</a></li>
-<li><a href="CommandLine.DuplicateOptionAnnotationsException.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_bottom">
-<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_bottom");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<a name="skip.navbar.bottom">
-<!--   -->
-</a></div>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-<p class="legalCopy"><small>Copyright &#169; 2017. All rights reserved.</small></p>
-</body>
-</html>
diff --git a/docs/apidocs/picocli/class-use/CommandLine.Help.Ansi.IStyle.html b/docs/apidocs/picocli/class-use/CommandLine.Help.Ansi.IStyle.html
deleted file mode 100644
index 6fcbde759..000000000
--- a/docs/apidocs/picocli/class-use/CommandLine.Help.Ansi.IStyle.html
+++ /dev/null
@@ -1,274 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- NewPage -->
-<html lang="en">
-<head>
-<!-- Generated by javadoc (1.8.0_51) on Wed Apr 19 00:59:45 JST 2017 -->
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Uses of Interface picocli.CommandLine.Help.Ansi.IStyle (picocli 0.9.1 API)</title>
-<meta name="date" content="2017-04-19">
-<link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
-<script type="text/javascript" src="../../script.js"></script>
-</head>
-<body>
-<script type="text/javascript"><!--
-    try {
-        if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Uses of Interface picocli.CommandLine.Help.Ansi.IStyle (picocli 0.9.1 API)";
-        }
-    }
-    catch(err) {
-    }
-//-->
-</script>
-<noscript>
-<div>JavaScript is disabled on your browser.</div>
-</noscript>
-<!-- ========= START OF TOP NAVBAR ======= -->
-<div class="topNav"><a name="navbar.top">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.top.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../../picocli/package-summary.html">Package</a></li>
-<li><a href="../../picocli/CommandLine.Help.Ansi.IStyle.html" title="interface in picocli">Class</a></li>
-<li class="navBarCell1Rev">Use</li>
-<li><a href="../package-tree.html">Tree</a></li>
-<li><a href="../../deprecated-list.html">Deprecated</a></li>
-<li><a href="../../index-all.html">Index</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li>Prev</li>
-<li>Next</li>
-</ul>
-<ul class="navList">
-<li><a href="../../index.html?picocli/class-use/CommandLine.Help.Ansi.IStyle.html" target="_top">Frames</a></li>
-<li><a href="CommandLine.Help.Ansi.IStyle.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_top">
-<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_top");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<a name="skip.navbar.top">
-<!--   -->
-</a></div>
-<!-- ========= END OF TOP NAVBAR ========= -->
-<div class="header">
-<h2 title="Uses of Interface picocli.CommandLine.Help.Ansi.IStyle" class="title">Uses of Interface<br>picocli.CommandLine.Help.Ansi.IStyle</h2>
-</div>
-<div class="classUseContainer">
-<ul class="blockList">
-<li class="blockList">
-<ul class="blockList">
-<li class="blockList"><a name="picocli">
-<!--   -->
-</a>
-<h3>Uses of <a href="../../picocli/CommandLine.Help.Ansi.IStyle.html" title="interface in picocli">CommandLine.Help.Ansi.IStyle</a> in <a href="../../picocli/package-summary.html">picocli</a></h3>
-<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing classes, and an explanation">
-<caption><span>Classes in <a href="../../picocli/package-summary.html">picocli</a> that implement <a href="../../picocli/CommandLine.Help.Ansi.IStyle.html" title="interface in picocli">CommandLine.Help.Ansi.IStyle</a></span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colFirst" scope="col">Modifier and Type</th>
-<th class="colLast" scope="col">Class and Description</th>
-</tr>
-<tbody>
-<tr class="altColor">
-<td class="colFirst"><code>static class&nbsp;</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../picocli/CommandLine.Help.Ansi.Style.html" title="enum in picocli">CommandLine.Help.Ansi.Style</a></span></code>
-<div class="block">A set of pre-defined ANSI escape code styles and colors, and a set of convenience methods for parsing
- text with embedded markup style names, as well as convenience methods for converting
- styles to strings with embedded escape codes.</div>
-</td>
-</tr>
-</tbody>
-</table>
-<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing fields, and an explanation">
-<caption><span>Fields in <a href="../../picocli/package-summary.html">picocli</a> with type parameters of type <a href="../../picocli/CommandLine.Help.Ansi.IStyle.html" title="interface in picocli">CommandLine.Help.Ansi.IStyle</a></span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colFirst" scope="col">Modifier and Type</th>
-<th class="colLast" scope="col">Field and Description</th>
-</tr>
-<tbody>
-<tr class="altColor">
-<td class="colFirst"><code><a href="http://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a>&lt;<a href="../../picocli/CommandLine.Help.Ansi.IStyle.html" title="interface in picocli">CommandLine.Help.Ansi.IStyle</a>&gt;</code></td>
-<td class="colLast"><span class="typeNameLabel">CommandLine.Help.ColorScheme.</span><code><span class="memberNameLink"><a href="../../picocli/CommandLine.Help.ColorScheme.html#commandStyles">commandStyles</a></span></code>&nbsp;</td>
-</tr>
-<tr class="rowColor">
-<td class="colFirst"><code><a href="http://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a>&lt;<a href="../../picocli/CommandLine.Help.Ansi.IStyle.html" title="interface in picocli">CommandLine.Help.Ansi.IStyle</a>&gt;</code></td>
-<td class="colLast"><span class="typeNameLabel">CommandLine.Help.ColorScheme.</span><code><span class="memberNameLink"><a href="../../picocli/CommandLine.Help.ColorScheme.html#optionParamStyles">optionParamStyles</a></span></code>&nbsp;</td>
-</tr>
-<tr class="altColor">
-<td class="colFirst"><code><a href="http://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a>&lt;<a href="../../picocli/CommandLine.Help.Ansi.IStyle.html" title="interface in picocli">CommandLine.Help.Ansi.IStyle</a>&gt;</code></td>
-<td class="colLast"><span class="typeNameLabel">CommandLine.Help.ColorScheme.</span><code><span class="memberNameLink"><a href="../../picocli/CommandLine.Help.ColorScheme.html#optionStyles">optionStyles</a></span></code>&nbsp;</td>
-</tr>
-<tr class="rowColor">
-<td class="colFirst"><code><a href="http://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a>&lt;<a href="../../picocli/CommandLine.Help.Ansi.IStyle.html" title="interface in picocli">CommandLine.Help.Ansi.IStyle</a>&gt;</code></td>
-<td class="colLast"><span class="typeNameLabel">CommandLine.Help.ColorScheme.</span><code><span class="memberNameLink"><a href="../../picocli/CommandLine.Help.ColorScheme.html#parameterStyles">parameterStyles</a></span></code>&nbsp;</td>
-</tr>
-</tbody>
-</table>
-<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing methods, and an explanation">
-<caption><span>Methods in <a href="../../picocli/package-summary.html">picocli</a> that return <a href="../../picocli/CommandLine.Help.Ansi.IStyle.html" title="interface in picocli">CommandLine.Help.Ansi.IStyle</a></span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colFirst" scope="col">Modifier and Type</th>
-<th class="colLast" scope="col">Method and Description</th>
-</tr>
-<tbody>
-<tr class="altColor">
-<td class="colFirst"><code>static <a href="../../picocli/CommandLine.Help.Ansi.IStyle.html" title="interface in picocli">CommandLine.Help.Ansi.IStyle</a></code></td>
-<td class="colLast"><span class="typeNameLabel">CommandLine.Help.Ansi.Style.</span><code><span class="memberNameLink"><a href="../../picocli/CommandLine.Help.Ansi.Style.html#bg-java.lang.String-">bg</a></span>(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;str)</code>
-<div class="block">Parses the specified style markup and returns the associated style.</div>
-</td>
-</tr>
-<tr class="rowColor">
-<td class="colFirst"><code>static <a href="../../picocli/CommandLine.Help.Ansi.IStyle.html" title="interface in picocli">CommandLine.Help.Ansi.IStyle</a></code></td>
-<td class="colLast"><span class="typeNameLabel">CommandLine.Help.Ansi.Style.</span><code><span class="memberNameLink"><a href="../../picocli/CommandLine.Help.Ansi.Style.html#fg-java.lang.String-">fg</a></span>(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;str)</code>
-<div class="block">Parses the specified style markup and returns the associated style.</div>
-</td>
-</tr>
-<tr class="altColor">
-<td class="colFirst"><code>static <a href="../../picocli/CommandLine.Help.Ansi.IStyle.html" title="interface in picocli">CommandLine.Help.Ansi.IStyle</a>[]</code></td>
-<td class="colLast"><span class="typeNameLabel">CommandLine.Help.Ansi.Style.</span><code><span class="memberNameLink"><a href="../../picocli/CommandLine.Help.Ansi.Style.html#parse-java.lang.String-">parse</a></span>(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;commaSeparatedCodes)</code>
-<div class="block">Parses the specified comma-separated sequence of style descriptors and returns the associated
-  styles.</div>
-</td>
-</tr>
-</tbody>
-</table>
-<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing methods, and an explanation">
-<caption><span>Methods in <a href="../../picocli/package-summary.html">picocli</a> with parameters of type <a href="../../picocli/CommandLine.Help.Ansi.IStyle.html" title="interface in picocli">CommandLine.Help.Ansi.IStyle</a></span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colFirst" scope="col">Modifier and Type</th>
-<th class="colLast" scope="col">Method and Description</th>
-</tr>
-<tbody>
-<tr class="altColor">
-<td class="colFirst"><code><a href="../../picocli/CommandLine.Help.ColorScheme.html" title="class in picocli">CommandLine.Help.ColorScheme</a></code></td>
-<td class="colLast"><span class="typeNameLabel">CommandLine.Help.ColorScheme.</span><code><span class="memberNameLink"><a href="../../picocli/CommandLine.Help.ColorScheme.html#commands-picocli.CommandLine.Help.Ansi.IStyle...-">commands</a></span>(<a href="../../picocli/CommandLine.Help.Ansi.IStyle.html" title="interface in picocli">CommandLine.Help.Ansi.IStyle</a>...&nbsp;styles)</code>
-<div class="block">Adds the specified styles to the styles for commands in this color scheme and returns this color scheme.</div>
-</td>
-</tr>
-<tr class="rowColor">
-<td class="colFirst"><code>static <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
-<td class="colLast"><span class="typeNameLabel">CommandLine.Help.Ansi.Style.</span><code><span class="memberNameLink"><a href="../../picocli/CommandLine.Help.Ansi.Style.html#off-picocli.CommandLine.Help.Ansi.IStyle...-">off</a></span>(<a href="../../picocli/CommandLine.Help.Ansi.IStyle.html" title="interface in picocli">CommandLine.Help.Ansi.IStyle</a>...&nbsp;styles)</code>
-<div class="block">Returns the concatenated ANSI escape codes for turning all specified styles off.</div>
-</td>
-</tr>
-<tr class="altColor">
-<td class="colFirst"><code>static <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
-<td class="colLast"><span class="typeNameLabel">CommandLine.Help.Ansi.Style.</span><code><span class="memberNameLink"><a href="../../picocli/CommandLine.Help.Ansi.Style.html#on-picocli.CommandLine.Help.Ansi.IStyle...-">on</a></span>(<a href="../../picocli/CommandLine.Help.Ansi.IStyle.html" title="interface in picocli">CommandLine.Help.Ansi.IStyle</a>...&nbsp;styles)</code>
-<div class="block">Returns the concatenated ANSI escape codes for turning all specified styles on.</div>
-</td>
-</tr>
-<tr class="rowColor">
-<td class="colFirst"><code><a href="../../picocli/CommandLine.Help.ColorScheme.html" title="class in picocli">CommandLine.Help.ColorScheme</a></code></td>
-<td class="colLast"><span class="typeNameLabel">CommandLine.Help.ColorScheme.</span><code><span class="memberNameLink"><a href="../../picocli/CommandLine.Help.ColorScheme.html#optionParams-picocli.CommandLine.Help.Ansi.IStyle...-">optionParams</a></span>(<a href="../../picocli/CommandLine.Help.Ansi.IStyle.html" title="interface in picocli">CommandLine.Help.Ansi.IStyle</a>...&nbsp;styles)</code>
-<div class="block">Adds the specified styles to the styles for option parameters in this color scheme and returns this color scheme.</div>
-</td>
-</tr>
-<tr class="altColor">
-<td class="colFirst"><code><a href="../../picocli/CommandLine.Help.ColorScheme.html" title="class in picocli">CommandLine.Help.ColorScheme</a></code></td>
-<td class="colLast"><span class="typeNameLabel">CommandLine.Help.ColorScheme.</span><code><span class="memberNameLink"><a href="../../picocli/CommandLine.Help.ColorScheme.html#options-picocli.CommandLine.Help.Ansi.IStyle...-">options</a></span>(<a href="../../picocli/CommandLine.Help.Ansi.IStyle.html" title="interface in picocli">CommandLine.Help.Ansi.IStyle</a>...&nbsp;styles)</code>
-<div class="block">Adds the specified styles to the styles for options in this color scheme and returns this color scheme.</div>
-</td>
-</tr>
-<tr class="rowColor">
-<td class="colFirst"><code><a href="../../picocli/CommandLine.Help.ColorScheme.html" title="class in picocli">CommandLine.Help.ColorScheme</a></code></td>
-<td class="colLast"><span class="typeNameLabel">CommandLine.Help.ColorScheme.</span><code><span class="memberNameLink"><a href="../../picocli/CommandLine.Help.ColorScheme.html#parameters-picocli.CommandLine.Help.Ansi.IStyle...-">parameters</a></span>(<a href="../../picocli/CommandLine.Help.Ansi.IStyle.html" title="interface in picocli">CommandLine.Help.Ansi.IStyle</a>...&nbsp;styles)</code>
-<div class="block">Adds the specified styles to the styles for positional parameters in this color scheme and returns this color scheme.</div>
-</td>
-</tr>
-</tbody>
-</table>
-<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing methods, and an explanation">
-<caption><span>Method parameters in <a href="../../picocli/package-summary.html">picocli</a> with type arguments of type <a href="../../picocli/CommandLine.Help.Ansi.IStyle.html" title="interface in picocli">CommandLine.Help.Ansi.IStyle</a></span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colFirst" scope="col">Modifier and Type</th>
-<th class="colLast" scope="col">Method and Description</th>
-</tr>
-<tbody>
-<tr class="altColor">
-<td class="colFirst"><code>static <a href="../../picocli/CommandLine.Help.Ansi.Text.html" title="class in picocli">CommandLine.Help.Ansi.Text</a></code></td>
-<td class="colLast"><span class="typeNameLabel">CommandLine.Help.Ansi.Text.</span><code><span class="memberNameLink"><a href="../../picocli/CommandLine.Help.Ansi.Text.html#apply-java.lang.String-java.util.List-">apply</a></span>(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;plainText,
-     <a href="http://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a>&lt;<a href="../../picocli/CommandLine.Help.Ansi.IStyle.html" title="interface in picocli">CommandLine.Help.Ansi.IStyle</a>&gt;&nbsp;styles)</code>
-<div class="block">Returns a new Text object where all the specified styles are applied to the full length of the
- specified plain text.</div>
-</td>
-</tr>
-<tr class="rowColor">
-<td class="colFirst"><code><a href="../../picocli/CommandLine.Help.Ansi.Text.html" title="class in picocli">CommandLine.Help.Ansi.Text</a></code></td>
-<td class="colLast"><span class="typeNameLabel">CommandLine.Help.IParamLabelRenderer.</span><code><span class="memberNameLink"><a href="../../picocli/CommandLine.Help.IParamLabelRenderer.html#renderParameterLabel-java.lang.reflect.Field-java.util.List-">renderParameterLabel</a></span>(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/reflect/Field.html?is-external=true" title="class or interface in java.lang.reflect">Field</a>&nbsp;field,
-                    <a href="http://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a>&lt;<a href="../../picocli/CommandLine.Help.Ansi.IStyle.html" title="interface in picocli">CommandLine.Help.Ansi.IStyle</a>&gt;&nbsp;styles)</code>
-<div class="block">Returns a text rendering of the Option parameter or positional parameter; returns an empty string
- <code>""</code> if the option is a boolean and does not take a parameter.</div>
-</td>
-</tr>
-</tbody>
-</table>
-</li>
-</ul>
-</li>
-</ul>
-</div>
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<div class="bottomNav"><a name="navbar.bottom">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.bottom.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../../picocli/package-summary.html">Package</a></li>
-<li><a href="../../picocli/CommandLine.Help.Ansi.IStyle.html" title="interface in picocli">Class</a></li>
-<li class="navBarCell1Rev">Use</li>
-<li><a href="../package-tree.html">Tree</a></li>
-<li><a href="../../deprecated-list.html">Deprecated</a></li>
-<li><a href="../../index-all.html">Index</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li>Prev</li>
-<li>Next</li>
-</ul>
-<ul class="navList">
-<li><a href="../../index.html?picocli/class-use/CommandLine.Help.Ansi.IStyle.html" target="_top">Frames</a></li>
-<li><a href="CommandLine.Help.Ansi.IStyle.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_bottom">
-<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_bottom");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<a name="skip.navbar.bottom">
-<!--   -->
-</a></div>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-<p class="legalCopy"><small>Copyright &#169; 2017. All rights reserved.</small></p>
-</body>
-</html>
diff --git a/docs/apidocs/picocli/class-use/CommandLine.Help.Ansi.Style.html b/docs/apidocs/picocli/class-use/CommandLine.Help.Ansi.Style.html
deleted file mode 100644
index b2d60a012..000000000
--- a/docs/apidocs/picocli/class-use/CommandLine.Help.Ansi.Style.html
+++ /dev/null
@@ -1,156 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- NewPage -->
-<html lang="en">
-<head>
-<!-- Generated by javadoc (1.8.0_51) on Wed Apr 19 00:59:45 JST 2017 -->
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Uses of Class picocli.CommandLine.Help.Ansi.Style (picocli 0.9.1 API)</title>
-<meta name="date" content="2017-04-19">
-<link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
-<script type="text/javascript" src="../../script.js"></script>
-</head>
-<body>
-<script type="text/javascript"><!--
-    try {
-        if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Uses of Class picocli.CommandLine.Help.Ansi.Style (picocli 0.9.1 API)";
-        }
-    }
-    catch(err) {
-    }
-//-->
-</script>
-<noscript>
-<div>JavaScript is disabled on your browser.</div>
-</noscript>
-<!-- ========= START OF TOP NAVBAR ======= -->
-<div class="topNav"><a name="navbar.top">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.top.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../../picocli/package-summary.html">Package</a></li>
-<li><a href="../../picocli/CommandLine.Help.Ansi.Style.html" title="enum in picocli">Class</a></li>
-<li class="navBarCell1Rev">Use</li>
-<li><a href="../package-tree.html">Tree</a></li>
-<li><a href="../../deprecated-list.html">Deprecated</a></li>
-<li><a href="../../index-all.html">Index</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li>Prev</li>
-<li>Next</li>
-</ul>
-<ul class="navList">
-<li><a href="../../index.html?picocli/class-use/CommandLine.Help.Ansi.Style.html" target="_top">Frames</a></li>
-<li><a href="CommandLine.Help.Ansi.Style.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_top">
-<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_top");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<a name="skip.navbar.top">
-<!--   -->
-</a></div>
-<!-- ========= END OF TOP NAVBAR ========= -->
-<div class="header">
-<h2 title="Uses of Class picocli.CommandLine.Help.Ansi.Style" class="title">Uses of Class<br>picocli.CommandLine.Help.Ansi.Style</h2>
-</div>
-<div class="classUseContainer">
-<ul class="blockList">
-<li class="blockList">
-<ul class="blockList">
-<li class="blockList"><a name="picocli">
-<!--   -->
-</a>
-<h3>Uses of <a href="../../picocli/CommandLine.Help.Ansi.Style.html" title="enum in picocli">CommandLine.Help.Ansi.Style</a> in <a href="../../picocli/package-summary.html">picocli</a></h3>
-<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing methods, and an explanation">
-<caption><span>Methods in <a href="../../picocli/package-summary.html">picocli</a> that return <a href="../../picocli/CommandLine.Help.Ansi.Style.html" title="enum in picocli">CommandLine.Help.Ansi.Style</a></span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colFirst" scope="col">Modifier and Type</th>
-<th class="colLast" scope="col">Method and Description</th>
-</tr>
-<tbody>
-<tr class="altColor">
-<td class="colFirst"><code>static <a href="../../picocli/CommandLine.Help.Ansi.Style.html" title="enum in picocli">CommandLine.Help.Ansi.Style</a></code></td>
-<td class="colLast"><span class="typeNameLabel">CommandLine.Help.Ansi.Style.</span><code><span class="memberNameLink"><a href="../../picocli/CommandLine.Help.Ansi.Style.html#valueOf-java.lang.String-">valueOf</a></span>(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;name)</code>
-<div class="block">Returns the enum constant of this type with the specified name.</div>
-</td>
-</tr>
-<tr class="rowColor">
-<td class="colFirst"><code>static <a href="../../picocli/CommandLine.Help.Ansi.Style.html" title="enum in picocli">CommandLine.Help.Ansi.Style</a>[]</code></td>
-<td class="colLast"><span class="typeNameLabel">CommandLine.Help.Ansi.Style.</span><code><span class="memberNameLink"><a href="../../picocli/CommandLine.Help.Ansi.Style.html#values--">values</a></span>()</code>
-<div class="block">Returns an array containing the constants of this enum type, in
-the order they are declared.</div>
-</td>
-</tr>
-</tbody>
-</table>
-</li>
-</ul>
-</li>
-</ul>
-</div>
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<div class="bottomNav"><a name="navbar.bottom">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.bottom.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../../picocli/package-summary.html">Package</a></li>
-<li><a href="../../picocli/CommandLine.Help.Ansi.Style.html" title="enum in picocli">Class</a></li>
-<li class="navBarCell1Rev">Use</li>
-<li><a href="../package-tree.html">Tree</a></li>
-<li><a href="../../deprecated-list.html">Deprecated</a></li>
-<li><a href="../../index-all.html">Index</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li>Prev</li>
-<li>Next</li>
-</ul>
-<ul class="navList">
-<li><a href="../../index.html?picocli/class-use/CommandLine.Help.Ansi.Style.html" target="_top">Frames</a></li>
-<li><a href="CommandLine.Help.Ansi.Style.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_bottom">
-<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_bottom");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<a name="skip.navbar.bottom">
-<!--   -->
-</a></div>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-<p class="legalCopy"><small>Copyright &#169; 2017. All rights reserved.</small></p>
-</body>
-</html>
diff --git a/docs/apidocs/picocli/class-use/CommandLine.Help.Ansi.Text.html b/docs/apidocs/picocli/class-use/CommandLine.Help.Ansi.Text.html
deleted file mode 100644
index ba2a6002d..000000000
--- a/docs/apidocs/picocli/class-use/CommandLine.Help.Ansi.Text.html
+++ /dev/null
@@ -1,295 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- NewPage -->
-<html lang="en">
-<head>
-<!-- Generated by javadoc (1.8.0_51) on Wed Apr 19 00:59:45 JST 2017 -->
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Uses of Class picocli.CommandLine.Help.Ansi.Text (picocli 0.9.1 API)</title>
-<meta name="date" content="2017-04-19">
-<link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
-<script type="text/javascript" src="../../script.js"></script>
-</head>
-<body>
-<script type="text/javascript"><!--
-    try {
-        if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Uses of Class picocli.CommandLine.Help.Ansi.Text (picocli 0.9.1 API)";
-        }
-    }
-    catch(err) {
-    }
-//-->
-</script>
-<noscript>
-<div>JavaScript is disabled on your browser.</div>
-</noscript>
-<!-- ========= START OF TOP NAVBAR ======= -->
-<div class="topNav"><a name="navbar.top">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.top.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../../picocli/package-summary.html">Package</a></li>
-<li><a href="../../picocli/CommandLine.Help.Ansi.Text.html" title="class in picocli">Class</a></li>
-<li class="navBarCell1Rev">Use</li>
-<li><a href="../package-tree.html">Tree</a></li>
-<li><a href="../../deprecated-list.html">Deprecated</a></li>
-<li><a href="../../index-all.html">Index</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li>Prev</li>
-<li>Next</li>
-</ul>
-<ul class="navList">
-<li><a href="../../index.html?picocli/class-use/CommandLine.Help.Ansi.Text.html" target="_top">Frames</a></li>
-<li><a href="CommandLine.Help.Ansi.Text.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_top">
-<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_top");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<a name="skip.navbar.top">
-<!--   -->
-</a></div>
-<!-- ========= END OF TOP NAVBAR ========= -->
-<div class="header">
-<h2 title="Uses of Class picocli.CommandLine.Help.Ansi.Text" class="title">Uses of Class<br>picocli.CommandLine.Help.Ansi.Text</h2>
-</div>
-<div class="classUseContainer">
-<ul class="blockList">
-<li class="blockList">
-<ul class="blockList">
-<li class="blockList"><a name="picocli">
-<!--   -->
-</a>
-<h3>Uses of <a href="../../picocli/CommandLine.Help.Ansi.Text.html" title="class in picocli">CommandLine.Help.Ansi.Text</a> in <a href="../../picocli/package-summary.html">picocli</a></h3>
-<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing fields, and an explanation">
-<caption><span>Fields in <a href="../../picocli/package-summary.html">picocli</a> with type parameters of type <a href="../../picocli/CommandLine.Help.Ansi.Text.html" title="class in picocli">CommandLine.Help.Ansi.Text</a></span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colFirst" scope="col">Modifier and Type</th>
-<th class="colLast" scope="col">Field and Description</th>
-</tr>
-<tbody>
-<tr class="altColor">
-<td class="colFirst"><code>protected <a href="http://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a>&lt;<a href="../../picocli/CommandLine.Help.Ansi.Text.html" title="class in picocli">CommandLine.Help.Ansi.Text</a>&gt;</code></td>
-<td class="colLast"><span class="typeNameLabel">CommandLine.Help.TextTable.</span><code><span class="memberNameLink"><a href="../../picocli/CommandLine.Help.TextTable.html#columnValues">columnValues</a></span></code>
-<div class="block">The <code>char[]</code> slots of the <code>TextTable</code> to copy text values into.</div>
-</td>
-</tr>
-</tbody>
-</table>
-<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing methods, and an explanation">
-<caption><span>Methods in <a href="../../picocli/package-summary.html">picocli</a> that return <a href="../../picocli/CommandLine.Help.Ansi.Text.html" title="class in picocli">CommandLine.Help.Ansi.Text</a></span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colFirst" scope="col">Modifier and Type</th>
-<th class="colLast" scope="col">Method and Description</th>
-</tr>
-<tbody>
-<tr class="altColor">
-<td class="colFirst"><code><a href="../../picocli/CommandLine.Help.Ansi.Text.html" title="class in picocli">CommandLine.Help.Ansi.Text</a></code></td>
-<td class="colLast"><span class="typeNameLabel">CommandLine.Help.Ansi.Text.</span><code><span class="memberNameLink"><a href="../../picocli/CommandLine.Help.Ansi.Text.html#append-picocli.CommandLine.Help.Ansi.Text-">append</a></span>(<a href="../../picocli/CommandLine.Help.Ansi.Text.html" title="class in picocli">CommandLine.Help.Ansi.Text</a>&nbsp;other)</code>
-<div class="block">Returns a new <code>Text</code> instance with the specified text appended.</div>
-</td>
-</tr>
-<tr class="rowColor">
-<td class="colFirst"><code><a href="../../picocli/CommandLine.Help.Ansi.Text.html" title="class in picocli">CommandLine.Help.Ansi.Text</a></code></td>
-<td class="colLast"><span class="typeNameLabel">CommandLine.Help.Ansi.Text.</span><code><span class="memberNameLink"><a href="../../picocli/CommandLine.Help.Ansi.Text.html#append-java.lang.String-">append</a></span>(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;string)</code>
-<div class="block">Returns a new <code>Text</code> instance with the specified text appended.</div>
-</td>
-</tr>
-<tr class="altColor">
-<td class="colFirst"><code>static <a href="../../picocli/CommandLine.Help.Ansi.Text.html" title="class in picocli">CommandLine.Help.Ansi.Text</a></code></td>
-<td class="colLast"><span class="typeNameLabel">CommandLine.Help.Ansi.Text.</span><code><span class="memberNameLink"><a href="../../picocli/CommandLine.Help.Ansi.Text.html#apply-java.lang.String-java.util.List-">apply</a></span>(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;plainText,
-     <a href="http://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a>&lt;<a href="../../picocli/CommandLine.Help.Ansi.IStyle.html" title="interface in picocli">CommandLine.Help.Ansi.IStyle</a>&gt;&nbsp;styles)</code>
-<div class="block">Returns a new Text object where all the specified styles are applied to the full length of the
- specified plain text.</div>
-</td>
-</tr>
-<tr class="rowColor">
-<td class="colFirst"><code><a href="../../picocli/CommandLine.Help.Ansi.Text.html" title="class in picocli">CommandLine.Help.Ansi.Text</a></code></td>
-<td class="colLast"><span class="typeNameLabel">CommandLine.Help.TextTable.</span><code><span class="memberNameLink"><a href="../../picocli/CommandLine.Help.TextTable.html#cellAt-int-int-">cellAt</a></span>(int&nbsp;row,
-      int&nbsp;col)</code>
-<div class="block">Returns the <code>char[]</code> slot at the specified row and column to write a text value into.</div>
-</td>
-</tr>
-<tr class="altColor">
-<td class="colFirst"><code><a href="../../picocli/CommandLine.Help.Ansi.Text.html" title="class in picocli">CommandLine.Help.Ansi.Text</a></code></td>
-<td class="colLast"><span class="typeNameLabel">CommandLine.Help.ColorScheme.</span><code><span class="memberNameLink"><a href="../../picocli/CommandLine.Help.ColorScheme.html#commandText-java.lang.String-">commandText</a></span>(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;command)</code>
-<div class="block">Returns a Text with all command styles applied to the specified command string.</div>
-</td>
-</tr>
-<tr class="rowColor">
-<td class="colFirst"><code><a href="../../picocli/CommandLine.Help.Ansi.Text.html" title="class in picocli">CommandLine.Help.Ansi.Text</a></code></td>
-<td class="colLast"><span class="typeNameLabel">CommandLine.Help.ColorScheme.</span><code><span class="memberNameLink"><a href="../../picocli/CommandLine.Help.ColorScheme.html#optionParamText-java.lang.String-">optionParamText</a></span>(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;optionParam)</code>
-<div class="block">Returns a Text with all optionParam styles applied to the specified optionParam string.</div>
-</td>
-</tr>
-<tr class="altColor">
-<td class="colFirst"><code><a href="../../picocli/CommandLine.Help.Ansi.Text.html" title="class in picocli">CommandLine.Help.Ansi.Text</a></code></td>
-<td class="colLast"><span class="typeNameLabel">CommandLine.Help.ColorScheme.</span><code><span class="memberNameLink"><a href="../../picocli/CommandLine.Help.ColorScheme.html#optionText-java.lang.String-">optionText</a></span>(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;option)</code>
-<div class="block">Returns a Text with all option styles applied to the specified option string.</div>
-</td>
-</tr>
-<tr class="rowColor">
-<td class="colFirst"><code><a href="../../picocli/CommandLine.Help.Ansi.Text.html" title="class in picocli">CommandLine.Help.Ansi.Text</a></code></td>
-<td class="colLast"><span class="typeNameLabel">CommandLine.Help.ColorScheme.</span><code><span class="memberNameLink"><a href="../../picocli/CommandLine.Help.ColorScheme.html#parameterText-java.lang.String-">parameterText</a></span>(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;parameter)</code>
-<div class="block">Returns a Text with all parameter styles applied to the specified parameter string.</div>
-</td>
-</tr>
-<tr class="altColor">
-<td class="colFirst"><code><a href="../../picocli/CommandLine.Help.Ansi.Text.html" title="class in picocli">CommandLine.Help.Ansi.Text</a>[][]</code></td>
-<td class="colLast"><span class="typeNameLabel">CommandLine.Help.IOptionRenderer.</span><code><span class="memberNameLink"><a href="../../picocli/CommandLine.Help.IOptionRenderer.html#render-picocli.CommandLine.Option-java.lang.reflect.Field-picocli.CommandLine.Help.IParamLabelRenderer-picocli.CommandLine.Help.ColorScheme-">render</a></span>(<a href="../../picocli/CommandLine.Option.html" title="annotation in picocli">CommandLine.Option</a>&nbsp;option,
-      <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/reflect/Field.html?is-external=true" title="class or interface in java.lang.reflect">Field</a>&nbsp;field,
-      <a href="../../picocli/CommandLine.Help.IParamLabelRenderer.html" title="interface in picocli">CommandLine.Help.IParamLabelRenderer</a>&nbsp;parameterLabelRenderer,
-      <a href="../../picocli/CommandLine.Help.ColorScheme.html" title="class in picocli">CommandLine.Help.ColorScheme</a>&nbsp;scheme)</code>
-<div class="block">Returns a text representation of the specified Option and the Field that captures the option value.</div>
-</td>
-</tr>
-<tr class="rowColor">
-<td class="colFirst"><code><a href="../../picocli/CommandLine.Help.Ansi.Text.html" title="class in picocli">CommandLine.Help.Ansi.Text</a>[][]</code></td>
-<td class="colLast"><span class="typeNameLabel">CommandLine.Help.IParameterRenderer.</span><code><span class="memberNameLink"><a href="../../picocli/CommandLine.Help.IParameterRenderer.html#render-picocli.CommandLine.Parameters-java.lang.reflect.Field-picocli.CommandLine.Help.IParamLabelRenderer-picocli.CommandLine.Help.ColorScheme-">render</a></span>(<a href="../../picocli/CommandLine.Parameters.html" title="annotation in picocli">CommandLine.Parameters</a>&nbsp;parameters,
-      <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/reflect/Field.html?is-external=true" title="class or interface in java.lang.reflect">Field</a>&nbsp;field,
-      <a href="../../picocli/CommandLine.Help.IParamLabelRenderer.html" title="interface in picocli">CommandLine.Help.IParamLabelRenderer</a>&nbsp;parameterLabelRenderer,
-      <a href="../../picocli/CommandLine.Help.ColorScheme.html" title="class in picocli">CommandLine.Help.ColorScheme</a>&nbsp;scheme)</code>
-<div class="block">Returns a text representation of the specified Parameters and the Field that captures the parameter values.</div>
-</td>
-</tr>
-<tr class="altColor">
-<td class="colFirst"><code><a href="../../picocli/CommandLine.Help.Ansi.Text.html" title="class in picocli">CommandLine.Help.Ansi.Text</a></code></td>
-<td class="colLast"><span class="typeNameLabel">CommandLine.Help.IParamLabelRenderer.</span><code><span class="memberNameLink"><a href="../../picocli/CommandLine.Help.IParamLabelRenderer.html#renderParameterLabel-java.lang.reflect.Field-java.util.List-">renderParameterLabel</a></span>(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/reflect/Field.html?is-external=true" title="class or interface in java.lang.reflect">Field</a>&nbsp;field,
-                    <a href="http://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a>&lt;<a href="../../picocli/CommandLine.Help.Ansi.IStyle.html" title="interface in picocli">CommandLine.Help.Ansi.IStyle</a>&gt;&nbsp;styles)</code>
-<div class="block">Returns a text rendering of the Option parameter or positional parameter; returns an empty string
- <code>""</code> if the option is a boolean and does not take a parameter.</div>
-</td>
-</tr>
-<tr class="rowColor">
-<td class="colFirst"><code><a href="../../picocli/CommandLine.Help.Ansi.Text.html" title="class in picocli">CommandLine.Help.Ansi.Text</a></code></td>
-<td class="colLast"><span class="typeNameLabel">CommandLine.Help.Ansi.Text.</span><code><span class="memberNameLink"><a href="../../picocli/CommandLine.Help.Ansi.Text.html#substring-int-">substring</a></span>(int&nbsp;start)</code>
-<div class="block">Returns a new <code>Text</code> instance that is a substring of this Text.</div>
-</td>
-</tr>
-<tr class="altColor">
-<td class="colFirst"><code><a href="../../picocli/CommandLine.Help.Ansi.Text.html" title="class in picocli">CommandLine.Help.Ansi.Text</a></code></td>
-<td class="colLast"><span class="typeNameLabel">CommandLine.Help.Ansi.Text.</span><code><span class="memberNameLink"><a href="../../picocli/CommandLine.Help.Ansi.Text.html#substring-int-int-">substring</a></span>(int&nbsp;start,
-         int&nbsp;end)</code>
-<div class="block">Returns a new <code>Text</code> instance that is a substring of this Text.</div>
-</td>
-</tr>
-</tbody>
-</table>
-<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing methods, and an explanation">
-<caption><span>Methods in <a href="../../picocli/package-summary.html">picocli</a> with parameters of type <a href="../../picocli/CommandLine.Help.Ansi.Text.html" title="class in picocli">CommandLine.Help.Ansi.Text</a></span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colFirst" scope="col">Modifier and Type</th>
-<th class="colLast" scope="col">Method and Description</th>
-</tr>
-<tbody>
-<tr class="altColor">
-<td class="colFirst"><code>void</code></td>
-<td class="colLast"><span class="typeNameLabel">CommandLine.Help.TextTable.</span><code><span class="memberNameLink"><a href="../../picocli/CommandLine.Help.TextTable.html#addRowValues-picocli.CommandLine.Help.Ansi.Text...-">addRowValues</a></span>(<a href="../../picocli/CommandLine.Help.Ansi.Text.html" title="class in picocli">CommandLine.Help.Ansi.Text</a>...&nbsp;values)</code>
-<div class="block">Adds a new <a href="../../picocli/CommandLine.Help.TextTable.html#addEmptyRow--">empty row</a>, then calls <code>putValue</code> for each of the specified values, adding more empty rows
- if the return value indicates that the value spanned multiple columns or was wrapped to multiple rows.</div>
-</td>
-</tr>
-<tr class="rowColor">
-<td class="colFirst"><code><a href="../../picocli/CommandLine.Help.Ansi.Text.html" title="class in picocli">CommandLine.Help.Ansi.Text</a></code></td>
-<td class="colLast"><span class="typeNameLabel">CommandLine.Help.Ansi.Text.</span><code><span class="memberNameLink"><a href="../../picocli/CommandLine.Help.Ansi.Text.html#append-picocli.CommandLine.Help.Ansi.Text-">append</a></span>(<a href="../../picocli/CommandLine.Help.Ansi.Text.html" title="class in picocli">CommandLine.Help.Ansi.Text</a>&nbsp;other)</code>
-<div class="block">Returns a new <code>Text</code> instance with the specified text appended.</div>
-</td>
-</tr>
-<tr class="altColor">
-<td class="colFirst"><code>void</code></td>
-<td class="colLast"><span class="typeNameLabel">CommandLine.Help.Ansi.Text.</span><code><span class="memberNameLink"><a href="../../picocli/CommandLine.Help.Ansi.Text.html#getStyledChars-int-int-picocli.CommandLine.Help.Ansi.Text-int-">getStyledChars</a></span>(int&nbsp;from,
-              int&nbsp;length,
-              <a href="../../picocli/CommandLine.Help.Ansi.Text.html" title="class in picocli">CommandLine.Help.Ansi.Text</a>&nbsp;destination,
-              int&nbsp;offset)</code>
-<div class="block">Copies the specified substring of this Text into the specified destination, preserving the markup.</div>
-</td>
-</tr>
-<tr class="rowColor">
-<td class="colFirst"><code>void</code></td>
-<td class="colLast"><span class="typeNameLabel">CommandLine.Help.Layout.</span><code><span class="memberNameLink"><a href="../../picocli/CommandLine.Help.Layout.html#layout-java.lang.reflect.Field-picocli.CommandLine.Help.Ansi.Text:A:A-">layout</a></span>(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/reflect/Field.html?is-external=true" title="class or interface in java.lang.reflect">Field</a>&nbsp;field,
-      <a href="../../picocli/CommandLine.Help.Ansi.Text.html" title="class in picocli">CommandLine.Help.Ansi.Text</a>[][]&nbsp;cellValues)</code>
-<div class="block">Copies the specified text values into the correct cells in the <a href="../../picocli/CommandLine.Help.TextTable.html" title="class in picocli"><code>CommandLine.Help.TextTable</code></a>.</div>
-</td>
-</tr>
-<tr class="altColor">
-<td class="colFirst"><code><a href="http://docs.oracle.com/javase/8/docs/api/java/awt/Point.html?is-external=true" title="class or interface in java.awt">Point</a></code></td>
-<td class="colLast"><span class="typeNameLabel">CommandLine.Help.TextTable.</span><code><span class="memberNameLink"><a href="../../picocli/CommandLine.Help.TextTable.html#putValue-int-int-picocli.CommandLine.Help.Ansi.Text-">putValue</a></span>(int&nbsp;row,
-        int&nbsp;col,
-        <a href="../../picocli/CommandLine.Help.Ansi.Text.html" title="class in picocli">CommandLine.Help.Ansi.Text</a>&nbsp;value)</code>
-<div class="block">Writes the specified value into the cell at the specified row and column and returns the last row and
- column written to.</div>
-</td>
-</tr>
-</tbody>
-</table>
-</li>
-</ul>
-</li>
-</ul>
-</div>
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<div class="bottomNav"><a name="navbar.bottom">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.bottom.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../../picocli/package-summary.html">Package</a></li>
-<li><a href="../../picocli/CommandLine.Help.Ansi.Text.html" title="class in picocli">Class</a></li>
-<li class="navBarCell1Rev">Use</li>
-<li><a href="../package-tree.html">Tree</a></li>
-<li><a href="../../deprecated-list.html">Deprecated</a></li>
-<li><a href="../../index-all.html">Index</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li>Prev</li>
-<li>Next</li>
-</ul>
-<ul class="navList">
-<li><a href="../../index.html?picocli/class-use/CommandLine.Help.Ansi.Text.html" target="_top">Frames</a></li>
-<li><a href="CommandLine.Help.Ansi.Text.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_bottom">
-<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_bottom");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<a name="skip.navbar.bottom">
-<!--   -->
-</a></div>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-<p class="legalCopy"><small>Copyright &#169; 2017. All rights reserved.</small></p>
-</body>
-</html>
diff --git a/docs/apidocs/picocli/class-use/CommandLine.Help.Ansi.html b/docs/apidocs/picocli/class-use/CommandLine.Help.Ansi.html
deleted file mode 100644
index f85e70b8d..000000000
--- a/docs/apidocs/picocli/class-use/CommandLine.Help.Ansi.html
+++ /dev/null
@@ -1,122 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- NewPage -->
-<html lang="en">
-<head>
-<!-- Generated by javadoc (1.8.0_51) on Wed Apr 19 00:59:45 JST 2017 -->
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Uses of Class picocli.CommandLine.Help.Ansi (picocli 0.9.1 API)</title>
-<meta name="date" content="2017-04-19">
-<link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
-<script type="text/javascript" src="../../script.js"></script>
-</head>
-<body>
-<script type="text/javascript"><!--
-    try {
-        if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Uses of Class picocli.CommandLine.Help.Ansi (picocli 0.9.1 API)";
-        }
-    }
-    catch(err) {
-    }
-//-->
-</script>
-<noscript>
-<div>JavaScript is disabled on your browser.</div>
-</noscript>
-<!-- ========= START OF TOP NAVBAR ======= -->
-<div class="topNav"><a name="navbar.top">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.top.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../../picocli/package-summary.html">Package</a></li>
-<li><a href="../../picocli/CommandLine.Help.Ansi.html" title="class in picocli">Class</a></li>
-<li class="navBarCell1Rev">Use</li>
-<li><a href="../package-tree.html">Tree</a></li>
-<li><a href="../../deprecated-list.html">Deprecated</a></li>
-<li><a href="../../index-all.html">Index</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li>Prev</li>
-<li>Next</li>
-</ul>
-<ul class="navList">
-<li><a href="../../index.html?picocli/class-use/CommandLine.Help.Ansi.html" target="_top">Frames</a></li>
-<li><a href="CommandLine.Help.Ansi.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_top">
-<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_top");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<a name="skip.navbar.top">
-<!--   -->
-</a></div>
-<!-- ========= END OF TOP NAVBAR ========= -->
-<div class="header">
-<h2 title="Uses of Class picocli.CommandLine.Help.Ansi" class="title">Uses of Class<br>picocli.CommandLine.Help.Ansi</h2>
-</div>
-<div class="classUseContainer">No usage of picocli.CommandLine.Help.Ansi</div>
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<div class="bottomNav"><a name="navbar.bottom">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.bottom.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../../picocli/package-summary.html">Package</a></li>
-<li><a href="../../picocli/CommandLine.Help.Ansi.html" title="class in picocli">Class</a></li>
-<li class="navBarCell1Rev">Use</li>
-<li><a href="../package-tree.html">Tree</a></li>
-<li><a href="../../deprecated-list.html">Deprecated</a></li>
-<li><a href="../../index-all.html">Index</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li>Prev</li>
-<li>Next</li>
-</ul>
-<ul class="navList">
-<li><a href="../../index.html?picocli/class-use/CommandLine.Help.Ansi.html" target="_top">Frames</a></li>
-<li><a href="CommandLine.Help.Ansi.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_bottom">
-<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_bottom");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<a name="skip.navbar.bottom">
-<!--   -->
-</a></div>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-<p class="legalCopy"><small>Copyright &#169; 2017. All rights reserved.</small></p>
-</body>
-</html>
diff --git a/docs/apidocs/picocli/class-use/CommandLine.Help.ColorScheme.html b/docs/apidocs/picocli/class-use/CommandLine.Help.ColorScheme.html
deleted file mode 100644
index b596ab07f..000000000
--- a/docs/apidocs/picocli/class-use/CommandLine.Help.ColorScheme.html
+++ /dev/null
@@ -1,274 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- NewPage -->
-<html lang="en">
-<head>
-<!-- Generated by javadoc (1.8.0_51) on Wed Apr 19 00:59:45 JST 2017 -->
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Uses of Class picocli.CommandLine.Help.ColorScheme (picocli 0.9.1 API)</title>
-<meta name="date" content="2017-04-19">
-<link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
-<script type="text/javascript" src="../../script.js"></script>
-</head>
-<body>
-<script type="text/javascript"><!--
-    try {
-        if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Uses of Class picocli.CommandLine.Help.ColorScheme (picocli 0.9.1 API)";
-        }
-    }
-    catch(err) {
-    }
-//-->
-</script>
-<noscript>
-<div>JavaScript is disabled on your browser.</div>
-</noscript>
-<!-- ========= START OF TOP NAVBAR ======= -->
-<div class="topNav"><a name="navbar.top">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.top.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../../picocli/package-summary.html">Package</a></li>
-<li><a href="../../picocli/CommandLine.Help.ColorScheme.html" title="class in picocli">Class</a></li>
-<li class="navBarCell1Rev">Use</li>
-<li><a href="../package-tree.html">Tree</a></li>
-<li><a href="../../deprecated-list.html">Deprecated</a></li>
-<li><a href="../../index-all.html">Index</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li>Prev</li>
-<li>Next</li>
-</ul>
-<ul class="navList">
-<li><a href="../../index.html?picocli/class-use/CommandLine.Help.ColorScheme.html" target="_top">Frames</a></li>
-<li><a href="CommandLine.Help.ColorScheme.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_top">
-<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_top");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<a name="skip.navbar.top">
-<!--   -->
-</a></div>
-<!-- ========= END OF TOP NAVBAR ========= -->
-<div class="header">
-<h2 title="Uses of Class picocli.CommandLine.Help.ColorScheme" class="title">Uses of Class<br>picocli.CommandLine.Help.ColorScheme</h2>
-</div>
-<div class="classUseContainer">
-<ul class="blockList">
-<li class="blockList">
-<ul class="blockList">
-<li class="blockList"><a name="picocli">
-<!--   -->
-</a>
-<h3>Uses of <a href="../../picocli/CommandLine.Help.ColorScheme.html" title="class in picocli">CommandLine.Help.ColorScheme</a> in <a href="../../picocli/package-summary.html">picocli</a></h3>
-<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing fields, and an explanation">
-<caption><span>Fields in <a href="../../picocli/package-summary.html">picocli</a> declared as <a href="../../picocli/CommandLine.Help.ColorScheme.html" title="class in picocli">CommandLine.Help.ColorScheme</a></span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colFirst" scope="col">Modifier and Type</th>
-<th class="colLast" scope="col">Field and Description</th>
-</tr>
-<tbody>
-<tr class="altColor">
-<td class="colFirst"><code>protected <a href="../../picocli/CommandLine.Help.ColorScheme.html" title="class in picocli">CommandLine.Help.ColorScheme</a></code></td>
-<td class="colLast"><span class="typeNameLabel">CommandLine.Help.Layout.</span><code><span class="memberNameLink"><a href="../../picocli/CommandLine.Help.Layout.html#colorScheme">colorScheme</a></span></code>&nbsp;</td>
-</tr>
-</tbody>
-</table>
-<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing methods, and an explanation">
-<caption><span>Methods in <a href="../../picocli/package-summary.html">picocli</a> that return <a href="../../picocli/CommandLine.Help.ColorScheme.html" title="class in picocli">CommandLine.Help.ColorScheme</a></span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colFirst" scope="col">Modifier and Type</th>
-<th class="colLast" scope="col">Method and Description</th>
-</tr>
-<tbody>
-<tr class="altColor">
-<td class="colFirst"><code><a href="../../picocli/CommandLine.Help.ColorScheme.html" title="class in picocli">CommandLine.Help.ColorScheme</a></code></td>
-<td class="colLast"><span class="typeNameLabel">CommandLine.Help.ColorScheme.</span><code><span class="memberNameLink"><a href="../../picocli/CommandLine.Help.ColorScheme.html#applySystemProperties--">applySystemProperties</a></span>()</code>
-<div class="block">Replaces colors and styles in this scheme with ones specified in system properties, and returns this scheme.</div>
-</td>
-</tr>
-<tr class="rowColor">
-<td class="colFirst"><code><a href="../../picocli/CommandLine.Help.ColorScheme.html" title="class in picocli">CommandLine.Help.ColorScheme</a></code></td>
-<td class="colLast"><span class="typeNameLabel">CommandLine.Help.ColorScheme.</span><code><span class="memberNameLink"><a href="../../picocli/CommandLine.Help.ColorScheme.html#commands-picocli.CommandLine.Help.Ansi.IStyle...-">commands</a></span>(<a href="../../picocli/CommandLine.Help.Ansi.IStyle.html" title="interface in picocli">CommandLine.Help.Ansi.IStyle</a>...&nbsp;styles)</code>
-<div class="block">Adds the specified styles to the styles for commands in this color scheme and returns this color scheme.</div>
-</td>
-</tr>
-<tr class="altColor">
-<td class="colFirst"><code>static <a href="../../picocli/CommandLine.Help.ColorScheme.html" title="class in picocli">CommandLine.Help.ColorScheme</a></code></td>
-<td class="colLast"><span class="typeNameLabel">CommandLine.Help.</span><code><span class="memberNameLink"><a href="../../picocli/CommandLine.Help.html#defaultColorScheme--">defaultColorScheme</a></span>()</code>
-<div class="block">Creates and returns a new <a href="../../picocli/CommandLine.Help.ColorScheme.html" title="class in picocli"><code>CommandLine.Help.ColorScheme</code></a> initialized with picocli default values: commands are bold,
-  options and parameters use a yellow foreground, and option parameters use italic.</div>
-</td>
-</tr>
-<tr class="rowColor">
-<td class="colFirst"><code><a href="../../picocli/CommandLine.Help.ColorScheme.html" title="class in picocli">CommandLine.Help.ColorScheme</a></code></td>
-<td class="colLast"><span class="typeNameLabel">CommandLine.Help.ColorScheme.</span><code><span class="memberNameLink"><a href="../../picocli/CommandLine.Help.ColorScheme.html#optionParams-picocli.CommandLine.Help.Ansi.IStyle...-">optionParams</a></span>(<a href="../../picocli/CommandLine.Help.Ansi.IStyle.html" title="interface in picocli">CommandLine.Help.Ansi.IStyle</a>...&nbsp;styles)</code>
-<div class="block">Adds the specified styles to the styles for option parameters in this color scheme and returns this color scheme.</div>
-</td>
-</tr>
-<tr class="altColor">
-<td class="colFirst"><code><a href="../../picocli/CommandLine.Help.ColorScheme.html" title="class in picocli">CommandLine.Help.ColorScheme</a></code></td>
-<td class="colLast"><span class="typeNameLabel">CommandLine.Help.ColorScheme.</span><code><span class="memberNameLink"><a href="../../picocli/CommandLine.Help.ColorScheme.html#options-picocli.CommandLine.Help.Ansi.IStyle...-">options</a></span>(<a href="../../picocli/CommandLine.Help.Ansi.IStyle.html" title="interface in picocli">CommandLine.Help.Ansi.IStyle</a>...&nbsp;styles)</code>
-<div class="block">Adds the specified styles to the styles for options in this color scheme and returns this color scheme.</div>
-</td>
-</tr>
-<tr class="rowColor">
-<td class="colFirst"><code><a href="../../picocli/CommandLine.Help.ColorScheme.html" title="class in picocli">CommandLine.Help.ColorScheme</a></code></td>
-<td class="colLast"><span class="typeNameLabel">CommandLine.Help.ColorScheme.</span><code><span class="memberNameLink"><a href="../../picocli/CommandLine.Help.ColorScheme.html#parameters-picocli.CommandLine.Help.Ansi.IStyle...-">parameters</a></span>(<a href="../../picocli/CommandLine.Help.Ansi.IStyle.html" title="interface in picocli">CommandLine.Help.Ansi.IStyle</a>...&nbsp;styles)</code>
-<div class="block">Adds the specified styles to the styles for positional parameters in this color scheme and returns this color scheme.</div>
-</td>
-</tr>
-</tbody>
-</table>
-<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing methods, and an explanation">
-<caption><span>Methods in <a href="../../picocli/package-summary.html">picocli</a> with parameters of type <a href="../../picocli/CommandLine.Help.ColorScheme.html" title="class in picocli">CommandLine.Help.ColorScheme</a></span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colFirst" scope="col">Modifier and Type</th>
-<th class="colLast" scope="col">Method and Description</th>
-</tr>
-<tbody>
-<tr class="altColor">
-<td class="colFirst"><code><a href="../../picocli/CommandLine.Help.Ansi.Text.html" title="class in picocli">CommandLine.Help.Ansi.Text</a>[][]</code></td>
-<td class="colLast"><span class="typeNameLabel">CommandLine.Help.IOptionRenderer.</span><code><span class="memberNameLink"><a href="../../picocli/CommandLine.Help.IOptionRenderer.html#render-picocli.CommandLine.Option-java.lang.reflect.Field-picocli.CommandLine.Help.IParamLabelRenderer-picocli.CommandLine.Help.ColorScheme-">render</a></span>(<a href="../../picocli/CommandLine.Option.html" title="annotation in picocli">CommandLine.Option</a>&nbsp;option,
-      <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/reflect/Field.html?is-external=true" title="class or interface in java.lang.reflect">Field</a>&nbsp;field,
-      <a href="../../picocli/CommandLine.Help.IParamLabelRenderer.html" title="interface in picocli">CommandLine.Help.IParamLabelRenderer</a>&nbsp;parameterLabelRenderer,
-      <a href="../../picocli/CommandLine.Help.ColorScheme.html" title="class in picocli">CommandLine.Help.ColorScheme</a>&nbsp;scheme)</code>
-<div class="block">Returns a text representation of the specified Option and the Field that captures the option value.</div>
-</td>
-</tr>
-<tr class="rowColor">
-<td class="colFirst"><code><a href="../../picocli/CommandLine.Help.Ansi.Text.html" title="class in picocli">CommandLine.Help.Ansi.Text</a>[][]</code></td>
-<td class="colLast"><span class="typeNameLabel">CommandLine.Help.IParameterRenderer.</span><code><span class="memberNameLink"><a href="../../picocli/CommandLine.Help.IParameterRenderer.html#render-picocli.CommandLine.Parameters-java.lang.reflect.Field-picocli.CommandLine.Help.IParamLabelRenderer-picocli.CommandLine.Help.ColorScheme-">render</a></span>(<a href="../../picocli/CommandLine.Parameters.html" title="annotation in picocli">CommandLine.Parameters</a>&nbsp;parameters,
-      <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/reflect/Field.html?is-external=true" title="class or interface in java.lang.reflect">Field</a>&nbsp;field,
-      <a href="../../picocli/CommandLine.Help.IParamLabelRenderer.html" title="interface in picocli">CommandLine.Help.IParamLabelRenderer</a>&nbsp;parameterLabelRenderer,
-      <a href="../../picocli/CommandLine.Help.ColorScheme.html" title="class in picocli">CommandLine.Help.ColorScheme</a>&nbsp;scheme)</code>
-<div class="block">Returns a text representation of the specified Parameters and the Field that captures the parameter values.</div>
-</td>
-</tr>
-<tr class="altColor">
-<td class="colFirst"><code>static void</code></td>
-<td class="colLast"><span class="typeNameLabel">CommandLine.</span><code><span class="memberNameLink"><a href="../../picocli/CommandLine.html#usage-java.lang.Object-java.io.PrintStream-picocli.CommandLine.Help.ColorScheme-">usage</a></span>(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&nbsp;annotatedObject,
-     <a href="http://docs.oracle.com/javase/8/docs/api/java/io/PrintStream.html?is-external=true" title="class or interface in java.io">PrintStream</a>&nbsp;out,
-     <a href="../../picocli/CommandLine.Help.ColorScheme.html" title="class in picocli">CommandLine.Help.ColorScheme</a>&nbsp;colorScheme)</code>
-<div class="block">Equivalent to <code>new CommandLine(annotatedObject).usage(out, colorScheme)</code>.</div>
-</td>
-</tr>
-<tr class="rowColor">
-<td class="colFirst"><code>void</code></td>
-<td class="colLast"><span class="typeNameLabel">CommandLine.</span><code><span class="memberNameLink"><a href="../../picocli/CommandLine.html#usage-java.io.PrintStream-picocli.CommandLine.Help.ColorScheme-">usage</a></span>(<a href="http://docs.oracle.com/javase/8/docs/api/java/io/PrintStream.html?is-external=true" title="class or interface in java.io">PrintStream</a>&nbsp;out,
-     <a href="../../picocli/CommandLine.Help.ColorScheme.html" title="class in picocli">CommandLine.Help.ColorScheme</a>&nbsp;colorScheme)</code>
-<div class="block">Prints a usage help message for the specified annotated class to the specified <code>PrintStream</code>.</div>
-</td>
-</tr>
-</tbody>
-</table>
-<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing constructors, and an explanation">
-<caption><span>Constructors in <a href="../../picocli/package-summary.html">picocli</a> with parameters of type <a href="../../picocli/CommandLine.Help.ColorScheme.html" title="class in picocli">CommandLine.Help.ColorScheme</a></span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colOne" scope="col">Constructor and Description</th>
-</tr>
-<tbody>
-<tr class="altColor">
-<td class="colLast"><code><span class="memberNameLink"><a href="../../picocli/CommandLine.Help.html#Help-java.lang.Object-picocli.CommandLine.Help.ColorScheme-">Help</a></span>(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&nbsp;annotatedObject,
-    <a href="../../picocli/CommandLine.Help.ColorScheme.html" title="class in picocli">CommandLine.Help.ColorScheme</a>&nbsp;colorScheme)</code>
-<div class="block">Constructs a new <code>Help</code> instance with the specified color scheme, initialized from annotatations
- on the specified class and superclasses.</div>
-</td>
-</tr>
-<tr class="rowColor">
-<td class="colLast"><code><span class="memberNameLink"><a href="../../picocli/CommandLine.Help.Layout.html#Layout-picocli.CommandLine.Help.ColorScheme-">Layout</a></span>(<a href="../../picocli/CommandLine.Help.ColorScheme.html" title="class in picocli">CommandLine.Help.ColorScheme</a>&nbsp;colorScheme)</code>
-<div class="block">Constructs a Layout with the specified color scheme, a new default TextTable, the
- <a href="../../picocli/CommandLine.Help.html#createDefaultOptionRenderer--">default option renderer</a>, and the
- <a href="../../picocli/CommandLine.Help.html#createDefaultParameterRenderer--">default parameter renderer</a>.</div>
-</td>
-</tr>
-<tr class="altColor">
-<td class="colLast"><code><span class="memberNameLink"><a href="../../picocli/CommandLine.Help.Layout.html#Layout-picocli.CommandLine.Help.ColorScheme-picocli.CommandLine.Help.TextTable-">Layout</a></span>(<a href="../../picocli/CommandLine.Help.ColorScheme.html" title="class in picocli">CommandLine.Help.ColorScheme</a>&nbsp;colorScheme,
-      <a href="../../picocli/CommandLine.Help.TextTable.html" title="class in picocli">CommandLine.Help.TextTable</a>&nbsp;textTable)</code>
-<div class="block">Constructs a Layout with the specified color scheme, the specified TextTable, the
- <a href="../../picocli/CommandLine.Help.html#createDefaultOptionRenderer--">default option renderer</a>, and the
- <a href="../../picocli/CommandLine.Help.html#createDefaultParameterRenderer--">default parameter renderer</a>.</div>
-</td>
-</tr>
-<tr class="rowColor">
-<td class="colLast"><code><span class="memberNameLink"><a href="../../picocli/CommandLine.Help.Layout.html#Layout-picocli.CommandLine.Help.ColorScheme-picocli.CommandLine.Help.TextTable-picocli.CommandLine.Help.IOptionRenderer-picocli.CommandLine.Help.IParameterRenderer-">Layout</a></span>(<a href="../../picocli/CommandLine.Help.ColorScheme.html" title="class in picocli">CommandLine.Help.ColorScheme</a>&nbsp;colorScheme,
-      <a href="../../picocli/CommandLine.Help.TextTable.html" title="class in picocli">CommandLine.Help.TextTable</a>&nbsp;textTable,
-      <a href="../../picocli/CommandLine.Help.IOptionRenderer.html" title="interface in picocli">CommandLine.Help.IOptionRenderer</a>&nbsp;optionRenderer,
-      <a href="../../picocli/CommandLine.Help.IParameterRenderer.html" title="interface in picocli">CommandLine.Help.IParameterRenderer</a>&nbsp;parameterRenderer)</code>
-<div class="block">Constructs a Layout with the specified color scheme, the specified TextTable, the
- specified option renderer and the specified parameter renderer.</div>
-</td>
-</tr>
-</tbody>
-</table>
-</li>
-</ul>
-</li>
-</ul>
-</div>
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<div class="bottomNav"><a name="navbar.bottom">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.bottom.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../../picocli/package-summary.html">Package</a></li>
-<li><a href="../../picocli/CommandLine.Help.ColorScheme.html" title="class in picocli">Class</a></li>
-<li class="navBarCell1Rev">Use</li>
-<li><a href="../package-tree.html">Tree</a></li>
-<li><a href="../../deprecated-list.html">Deprecated</a></li>
-<li><a href="../../index-all.html">Index</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li>Prev</li>
-<li>Next</li>
-</ul>
-<ul class="navList">
-<li><a href="../../index.html?picocli/class-use/CommandLine.Help.ColorScheme.html" target="_top">Frames</a></li>
-<li><a href="CommandLine.Help.ColorScheme.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_bottom">
-<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_bottom");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<a name="skip.navbar.bottom">
-<!--   -->
-</a></div>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-<p class="legalCopy"><small>Copyright &#169; 2017. All rights reserved.</small></p>
-</body>
-</html>
diff --git a/docs/apidocs/picocli/class-use/CommandLine.Help.Column.Overflow.html b/docs/apidocs/picocli/class-use/CommandLine.Help.Column.Overflow.html
deleted file mode 100644
index daa413e82..000000000
--- a/docs/apidocs/picocli/class-use/CommandLine.Help.Column.Overflow.html
+++ /dev/null
@@ -1,184 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- NewPage -->
-<html lang="en">
-<head>
-<!-- Generated by javadoc (1.8.0_51) on Wed Apr 19 00:59:45 JST 2017 -->
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Uses of Class picocli.CommandLine.Help.Column.Overflow (picocli 0.9.1 API)</title>
-<meta name="date" content="2017-04-19">
-<link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
-<script type="text/javascript" src="../../script.js"></script>
-</head>
-<body>
-<script type="text/javascript"><!--
-    try {
-        if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Uses of Class picocli.CommandLine.Help.Column.Overflow (picocli 0.9.1 API)";
-        }
-    }
-    catch(err) {
-    }
-//-->
-</script>
-<noscript>
-<div>JavaScript is disabled on your browser.</div>
-</noscript>
-<!-- ========= START OF TOP NAVBAR ======= -->
-<div class="topNav"><a name="navbar.top">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.top.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../../picocli/package-summary.html">Package</a></li>
-<li><a href="../../picocli/CommandLine.Help.Column.Overflow.html" title="enum in picocli">Class</a></li>
-<li class="navBarCell1Rev">Use</li>
-<li><a href="../package-tree.html">Tree</a></li>
-<li><a href="../../deprecated-list.html">Deprecated</a></li>
-<li><a href="../../index-all.html">Index</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li>Prev</li>
-<li>Next</li>
-</ul>
-<ul class="navList">
-<li><a href="../../index.html?picocli/class-use/CommandLine.Help.Column.Overflow.html" target="_top">Frames</a></li>
-<li><a href="CommandLine.Help.Column.Overflow.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_top">
-<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_top");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<a name="skip.navbar.top">
-<!--   -->
-</a></div>
-<!-- ========= END OF TOP NAVBAR ========= -->
-<div class="header">
-<h2 title="Uses of Class picocli.CommandLine.Help.Column.Overflow" class="title">Uses of Class<br>picocli.CommandLine.Help.Column.Overflow</h2>
-</div>
-<div class="classUseContainer">
-<ul class="blockList">
-<li class="blockList">
-<ul class="blockList">
-<li class="blockList"><a name="picocli">
-<!--   -->
-</a>
-<h3>Uses of <a href="../../picocli/CommandLine.Help.Column.Overflow.html" title="enum in picocli">CommandLine.Help.Column.Overflow</a> in <a href="../../picocli/package-summary.html">picocli</a></h3>
-<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing fields, and an explanation">
-<caption><span>Fields in <a href="../../picocli/package-summary.html">picocli</a> declared as <a href="../../picocli/CommandLine.Help.Column.Overflow.html" title="enum in picocli">CommandLine.Help.Column.Overflow</a></span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colFirst" scope="col">Modifier and Type</th>
-<th class="colLast" scope="col">Field and Description</th>
-</tr>
-<tbody>
-<tr class="altColor">
-<td class="colFirst"><code><a href="../../picocli/CommandLine.Help.Column.Overflow.html" title="enum in picocli">CommandLine.Help.Column.Overflow</a></code></td>
-<td class="colLast"><span class="typeNameLabel">CommandLine.Help.Column.</span><code><span class="memberNameLink"><a href="../../picocli/CommandLine.Help.Column.html#overflow">overflow</a></span></code>
-<div class="block">Policy that determines how to handle values larger than the column width.</div>
-</td>
-</tr>
-</tbody>
-</table>
-<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing methods, and an explanation">
-<caption><span>Methods in <a href="../../picocli/package-summary.html">picocli</a> that return <a href="../../picocli/CommandLine.Help.Column.Overflow.html" title="enum in picocli">CommandLine.Help.Column.Overflow</a></span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colFirst" scope="col">Modifier and Type</th>
-<th class="colLast" scope="col">Method and Description</th>
-</tr>
-<tbody>
-<tr class="altColor">
-<td class="colFirst"><code>static <a href="../../picocli/CommandLine.Help.Column.Overflow.html" title="enum in picocli">CommandLine.Help.Column.Overflow</a></code></td>
-<td class="colLast"><span class="typeNameLabel">CommandLine.Help.Column.Overflow.</span><code><span class="memberNameLink"><a href="../../picocli/CommandLine.Help.Column.Overflow.html#valueOf-java.lang.String-">valueOf</a></span>(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;name)</code>
-<div class="block">Returns the enum constant of this type with the specified name.</div>
-</td>
-</tr>
-<tr class="rowColor">
-<td class="colFirst"><code>static <a href="../../picocli/CommandLine.Help.Column.Overflow.html" title="enum in picocli">CommandLine.Help.Column.Overflow</a>[]</code></td>
-<td class="colLast"><span class="typeNameLabel">CommandLine.Help.Column.Overflow.</span><code><span class="memberNameLink"><a href="../../picocli/CommandLine.Help.Column.Overflow.html#values--">values</a></span>()</code>
-<div class="block">Returns an array containing the constants of this enum type, in
-the order they are declared.</div>
-</td>
-</tr>
-</tbody>
-</table>
-<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing constructors, and an explanation">
-<caption><span>Constructors in <a href="../../picocli/package-summary.html">picocli</a> with parameters of type <a href="../../picocli/CommandLine.Help.Column.Overflow.html" title="enum in picocli">CommandLine.Help.Column.Overflow</a></span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colOne" scope="col">Constructor and Description</th>
-</tr>
-<tbody>
-<tr class="altColor">
-<td class="colLast"><code><span class="memberNameLink"><a href="../../picocli/CommandLine.Help.Column.html#Column-int-int-picocli.CommandLine.Help.Column.Overflow-">Column</a></span>(int&nbsp;width,
-      int&nbsp;indent,
-      <a href="../../picocli/CommandLine.Help.Column.Overflow.html" title="enum in picocli">CommandLine.Help.Column.Overflow</a>&nbsp;overflow)</code>&nbsp;</td>
-</tr>
-</tbody>
-</table>
-</li>
-</ul>
-</li>
-</ul>
-</div>
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<div class="bottomNav"><a name="navbar.bottom">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.bottom.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../../picocli/package-summary.html">Package</a></li>
-<li><a href="../../picocli/CommandLine.Help.Column.Overflow.html" title="enum in picocli">Class</a></li>
-<li class="navBarCell1Rev">Use</li>
-<li><a href="../package-tree.html">Tree</a></li>
-<li><a href="../../deprecated-list.html">Deprecated</a></li>
-<li><a href="../../index-all.html">Index</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li>Prev</li>
-<li>Next</li>
-</ul>
-<ul class="navList">
-<li><a href="../../index.html?picocli/class-use/CommandLine.Help.Column.Overflow.html" target="_top">Frames</a></li>
-<li><a href="CommandLine.Help.Column.Overflow.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_bottom">
-<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_bottom");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<a name="skip.navbar.bottom">
-<!--   -->
-</a></div>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-<p class="legalCopy"><small>Copyright &#169; 2017. All rights reserved.</small></p>
-</body>
-</html>
diff --git a/docs/apidocs/picocli/class-use/CommandLine.Help.Column.html b/docs/apidocs/picocli/class-use/CommandLine.Help.Column.html
deleted file mode 100644
index 686928726..000000000
--- a/docs/apidocs/picocli/class-use/CommandLine.Help.Column.html
+++ /dev/null
@@ -1,162 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- NewPage -->
-<html lang="en">
-<head>
-<!-- Generated by javadoc (1.8.0_51) on Wed Apr 19 00:59:45 JST 2017 -->
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Uses of Class picocli.CommandLine.Help.Column (picocli 0.9.1 API)</title>
-<meta name="date" content="2017-04-19">
-<link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
-<script type="text/javascript" src="../../script.js"></script>
-</head>
-<body>
-<script type="text/javascript"><!--
-    try {
-        if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Uses of Class picocli.CommandLine.Help.Column (picocli 0.9.1 API)";
-        }
-    }
-    catch(err) {
-    }
-//-->
-</script>
-<noscript>
-<div>JavaScript is disabled on your browser.</div>
-</noscript>
-<!-- ========= START OF TOP NAVBAR ======= -->
-<div class="topNav"><a name="navbar.top">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.top.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../../picocli/package-summary.html">Package</a></li>
-<li><a href="../../picocli/CommandLine.Help.Column.html" title="class in picocli">Class</a></li>
-<li class="navBarCell1Rev">Use</li>
-<li><a href="../package-tree.html">Tree</a></li>
-<li><a href="../../deprecated-list.html">Deprecated</a></li>
-<li><a href="../../index-all.html">Index</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li>Prev</li>
-<li>Next</li>
-</ul>
-<ul class="navList">
-<li><a href="../../index.html?picocli/class-use/CommandLine.Help.Column.html" target="_top">Frames</a></li>
-<li><a href="CommandLine.Help.Column.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_top">
-<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_top");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<a name="skip.navbar.top">
-<!--   -->
-</a></div>
-<!-- ========= END OF TOP NAVBAR ========= -->
-<div class="header">
-<h2 title="Uses of Class picocli.CommandLine.Help.Column" class="title">Uses of Class<br>picocli.CommandLine.Help.Column</h2>
-</div>
-<div class="classUseContainer">
-<ul class="blockList">
-<li class="blockList">
-<ul class="blockList">
-<li class="blockList"><a name="picocli">
-<!--   -->
-</a>
-<h3>Uses of <a href="../../picocli/CommandLine.Help.Column.html" title="class in picocli">CommandLine.Help.Column</a> in <a href="../../picocli/package-summary.html">picocli</a></h3>
-<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing fields, and an explanation">
-<caption><span>Fields in <a href="../../picocli/package-summary.html">picocli</a> declared as <a href="../../picocli/CommandLine.Help.Column.html" title="class in picocli">CommandLine.Help.Column</a></span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colFirst" scope="col">Modifier and Type</th>
-<th class="colLast" scope="col">Field and Description</th>
-</tr>
-<tbody>
-<tr class="altColor">
-<td class="colFirst"><code><a href="../../picocli/CommandLine.Help.Column.html" title="class in picocli">CommandLine.Help.Column</a>[]</code></td>
-<td class="colLast"><span class="typeNameLabel">CommandLine.Help.TextTable.</span><code><span class="memberNameLink"><a href="../../picocli/CommandLine.Help.TextTable.html#columns">columns</a></span></code>
-<div class="block">The column definitions of this table.</div>
-</td>
-</tr>
-</tbody>
-</table>
-<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing constructors, and an explanation">
-<caption><span>Constructors in <a href="../../picocli/package-summary.html">picocli</a> with parameters of type <a href="../../picocli/CommandLine.Help.Column.html" title="class in picocli">CommandLine.Help.Column</a></span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colOne" scope="col">Constructor and Description</th>
-</tr>
-<tbody>
-<tr class="altColor">
-<td class="colLast"><code><span class="memberNameLink"><a href="../../picocli/CommandLine.Help.TextTable.html#TextTable-picocli.CommandLine.Help.Column...-">TextTable</a></span>(<a href="../../picocli/CommandLine.Help.Column.html" title="class in picocli">CommandLine.Help.Column</a>...&nbsp;columns)</code>
-<div class="block">Constructs a <code>TextTable</code> with the specified columns.</div>
-</td>
-</tr>
-</tbody>
-</table>
-</li>
-</ul>
-</li>
-</ul>
-</div>
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<div class="bottomNav"><a name="navbar.bottom">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.bottom.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../../picocli/package-summary.html">Package</a></li>
-<li><a href="../../picocli/CommandLine.Help.Column.html" title="class in picocli">Class</a></li>
-<li class="navBarCell1Rev">Use</li>
-<li><a href="../package-tree.html">Tree</a></li>
-<li><a href="../../deprecated-list.html">Deprecated</a></li>
-<li><a href="../../index-all.html">Index</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li>Prev</li>
-<li>Next</li>
-</ul>
-<ul class="navList">
-<li><a href="../../index.html?picocli/class-use/CommandLine.Help.Column.html" target="_top">Frames</a></li>
-<li><a href="CommandLine.Help.Column.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_bottom">
-<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_bottom");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<a name="skip.navbar.bottom">
-<!--   -->
-</a></div>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-<p class="legalCopy"><small>Copyright &#169; 2017. All rights reserved.</small></p>
-</body>
-</html>
diff --git a/docs/apidocs/picocli/class-use/CommandLine.Help.IOptionRenderer.html b/docs/apidocs/picocli/class-use/CommandLine.Help.IOptionRenderer.html
deleted file mode 100644
index 5c2dec48a..000000000
--- a/docs/apidocs/picocli/class-use/CommandLine.Help.IOptionRenderer.html
+++ /dev/null
@@ -1,187 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- NewPage -->
-<html lang="en">
-<head>
-<!-- Generated by javadoc (1.8.0_51) on Wed Apr 19 00:59:45 JST 2017 -->
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Uses of Interface picocli.CommandLine.Help.IOptionRenderer (picocli 0.9.1 API)</title>
-<meta name="date" content="2017-04-19">
-<link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
-<script type="text/javascript" src="../../script.js"></script>
-</head>
-<body>
-<script type="text/javascript"><!--
-    try {
-        if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Uses of Interface picocli.CommandLine.Help.IOptionRenderer (picocli 0.9.1 API)";
-        }
-    }
-    catch(err) {
-    }
-//-->
-</script>
-<noscript>
-<div>JavaScript is disabled on your browser.</div>
-</noscript>
-<!-- ========= START OF TOP NAVBAR ======= -->
-<div class="topNav"><a name="navbar.top">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.top.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../../picocli/package-summary.html">Package</a></li>
-<li><a href="../../picocli/CommandLine.Help.IOptionRenderer.html" title="interface in picocli">Class</a></li>
-<li class="navBarCell1Rev">Use</li>
-<li><a href="../package-tree.html">Tree</a></li>
-<li><a href="../../deprecated-list.html">Deprecated</a></li>
-<li><a href="../../index-all.html">Index</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li>Prev</li>
-<li>Next</li>
-</ul>
-<ul class="navList">
-<li><a href="../../index.html?picocli/class-use/CommandLine.Help.IOptionRenderer.html" target="_top">Frames</a></li>
-<li><a href="CommandLine.Help.IOptionRenderer.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_top">
-<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_top");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<a name="skip.navbar.top">
-<!--   -->
-</a></div>
-<!-- ========= END OF TOP NAVBAR ========= -->
-<div class="header">
-<h2 title="Uses of Interface picocli.CommandLine.Help.IOptionRenderer" class="title">Uses of Interface<br>picocli.CommandLine.Help.IOptionRenderer</h2>
-</div>
-<div class="classUseContainer">
-<ul class="blockList">
-<li class="blockList">
-<ul class="blockList">
-<li class="blockList"><a name="picocli">
-<!--   -->
-</a>
-<h3>Uses of <a href="../../picocli/CommandLine.Help.IOptionRenderer.html" title="interface in picocli">CommandLine.Help.IOptionRenderer</a> in <a href="../../picocli/package-summary.html">picocli</a></h3>
-<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing fields, and an explanation">
-<caption><span>Fields in <a href="../../picocli/package-summary.html">picocli</a> declared as <a href="../../picocli/CommandLine.Help.IOptionRenderer.html" title="interface in picocli">CommandLine.Help.IOptionRenderer</a></span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colFirst" scope="col">Modifier and Type</th>
-<th class="colLast" scope="col">Field and Description</th>
-</tr>
-<tbody>
-<tr class="altColor">
-<td class="colFirst"><code>protected <a href="../../picocli/CommandLine.Help.IOptionRenderer.html" title="interface in picocli">CommandLine.Help.IOptionRenderer</a></code></td>
-<td class="colLast"><span class="typeNameLabel">CommandLine.Help.Layout.</span><code><span class="memberNameLink"><a href="../../picocli/CommandLine.Help.Layout.html#optionRenderer">optionRenderer</a></span></code>&nbsp;</td>
-</tr>
-</tbody>
-</table>
-<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing methods, and an explanation">
-<caption><span>Methods in <a href="../../picocli/package-summary.html">picocli</a> that return <a href="../../picocli/CommandLine.Help.IOptionRenderer.html" title="interface in picocli">CommandLine.Help.IOptionRenderer</a></span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colFirst" scope="col">Modifier and Type</th>
-<th class="colLast" scope="col">Method and Description</th>
-</tr>
-<tbody>
-<tr class="altColor">
-<td class="colFirst"><code><a href="../../picocli/CommandLine.Help.IOptionRenderer.html" title="interface in picocli">CommandLine.Help.IOptionRenderer</a></code></td>
-<td class="colLast"><span class="typeNameLabel">CommandLine.Help.</span><code><span class="memberNameLink"><a href="../../picocli/CommandLine.Help.html#createDefaultOptionRenderer--">createDefaultOptionRenderer</a></span>()</code>
-<div class="block">Returns a new default OptionRenderer which converts <a href="../../picocli/CommandLine.Option.html" title="annotation in picocli"><code>Options</code></a> to five columns of text to match
-  the default <a href="../../picocli/CommandLine.Help.TextTable.html" title="class in picocli">TextTable</a> column layout.</div>
-</td>
-</tr>
-<tr class="rowColor">
-<td class="colFirst"><code>static <a href="../../picocli/CommandLine.Help.IOptionRenderer.html" title="interface in picocli">CommandLine.Help.IOptionRenderer</a></code></td>
-<td class="colLast"><span class="typeNameLabel">CommandLine.Help.</span><code><span class="memberNameLink"><a href="../../picocli/CommandLine.Help.html#createMinimalOptionRenderer--">createMinimalOptionRenderer</a></span>()</code>
-<div class="block">Returns a new minimal OptionRenderer which converts <a href="../../picocli/CommandLine.Option.html" title="annotation in picocli"><code>Options</code></a> to a single row with two columns
- of text: an option name and a description.</div>
-</td>
-</tr>
-</tbody>
-</table>
-<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing constructors, and an explanation">
-<caption><span>Constructors in <a href="../../picocli/package-summary.html">picocli</a> with parameters of type <a href="../../picocli/CommandLine.Help.IOptionRenderer.html" title="interface in picocli">CommandLine.Help.IOptionRenderer</a></span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colOne" scope="col">Constructor and Description</th>
-</tr>
-<tbody>
-<tr class="altColor">
-<td class="colLast"><code><span class="memberNameLink"><a href="../../picocli/CommandLine.Help.Layout.html#Layout-picocli.CommandLine.Help.ColorScheme-picocli.CommandLine.Help.TextTable-picocli.CommandLine.Help.IOptionRenderer-picocli.CommandLine.Help.IParameterRenderer-">Layout</a></span>(<a href="../../picocli/CommandLine.Help.ColorScheme.html" title="class in picocli">CommandLine.Help.ColorScheme</a>&nbsp;colorScheme,
-      <a href="../../picocli/CommandLine.Help.TextTable.html" title="class in picocli">CommandLine.Help.TextTable</a>&nbsp;textTable,
-      <a href="../../picocli/CommandLine.Help.IOptionRenderer.html" title="interface in picocli">CommandLine.Help.IOptionRenderer</a>&nbsp;optionRenderer,
-      <a href="../../picocli/CommandLine.Help.IParameterRenderer.html" title="interface in picocli">CommandLine.Help.IParameterRenderer</a>&nbsp;parameterRenderer)</code>
-<div class="block">Constructs a Layout with the specified color scheme, the specified TextTable, the
- specified option renderer and the specified parameter renderer.</div>
-</td>
-</tr>
-</tbody>
-</table>
-</li>
-</ul>
-</li>
-</ul>
-</div>
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<div class="bottomNav"><a name="navbar.bottom">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.bottom.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../../picocli/package-summary.html">Package</a></li>
-<li><a href="../../picocli/CommandLine.Help.IOptionRenderer.html" title="interface in picocli">Class</a></li>
-<li class="navBarCell1Rev">Use</li>
-<li><a href="../package-tree.html">Tree</a></li>
-<li><a href="../../deprecated-list.html">Deprecated</a></li>
-<li><a href="../../index-all.html">Index</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li>Prev</li>
-<li>Next</li>
-</ul>
-<ul class="navList">
-<li><a href="../../index.html?picocli/class-use/CommandLine.Help.IOptionRenderer.html" target="_top">Frames</a></li>
-<li><a href="CommandLine.Help.IOptionRenderer.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_bottom">
-<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_bottom");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<a name="skip.navbar.bottom">
-<!--   -->
-</a></div>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-<p class="legalCopy"><small>Copyright &#169; 2017. All rights reserved.</small></p>
-</body>
-</html>
diff --git a/docs/apidocs/picocli/class-use/CommandLine.Help.IParamLabelRenderer.html b/docs/apidocs/picocli/class-use/CommandLine.Help.IParamLabelRenderer.html
deleted file mode 100644
index 259993eeb..000000000
--- a/docs/apidocs/picocli/class-use/CommandLine.Help.IParamLabelRenderer.html
+++ /dev/null
@@ -1,247 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- NewPage -->
-<html lang="en">
-<head>
-<!-- Generated by javadoc (1.8.0_51) on Wed Apr 19 00:59:45 JST 2017 -->
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Uses of Interface picocli.CommandLine.Help.IParamLabelRenderer (picocli 0.9.1 API)</title>
-<meta name="date" content="2017-04-19">
-<link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
-<script type="text/javascript" src="../../script.js"></script>
-</head>
-<body>
-<script type="text/javascript"><!--
-    try {
-        if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Uses of Interface picocli.CommandLine.Help.IParamLabelRenderer (picocli 0.9.1 API)";
-        }
-    }
-    catch(err) {
-    }
-//-->
-</script>
-<noscript>
-<div>JavaScript is disabled on your browser.</div>
-</noscript>
-<!-- ========= START OF TOP NAVBAR ======= -->
-<div class="topNav"><a name="navbar.top">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.top.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../../picocli/package-summary.html">Package</a></li>
-<li><a href="../../picocli/CommandLine.Help.IParamLabelRenderer.html" title="interface in picocli">Class</a></li>
-<li class="navBarCell1Rev">Use</li>
-<li><a href="../package-tree.html">Tree</a></li>
-<li><a href="../../deprecated-list.html">Deprecated</a></li>
-<li><a href="../../index-all.html">Index</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li>Prev</li>
-<li>Next</li>
-</ul>
-<ul class="navList">
-<li><a href="../../index.html?picocli/class-use/CommandLine.Help.IParamLabelRenderer.html" target="_top">Frames</a></li>
-<li><a href="CommandLine.Help.IParamLabelRenderer.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_top">
-<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_top");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<a name="skip.navbar.top">
-<!--   -->
-</a></div>
-<!-- ========= END OF TOP NAVBAR ========= -->
-<div class="header">
-<h2 title="Uses of Interface picocli.CommandLine.Help.IParamLabelRenderer" class="title">Uses of Interface<br>picocli.CommandLine.Help.IParamLabelRenderer</h2>
-</div>
-<div class="classUseContainer">
-<ul class="blockList">
-<li class="blockList">
-<ul class="blockList">
-<li class="blockList"><a name="picocli">
-<!--   -->
-</a>
-<h3>Uses of <a href="../../picocli/CommandLine.Help.IParamLabelRenderer.html" title="interface in picocli">CommandLine.Help.IParamLabelRenderer</a> in <a href="../../picocli/package-summary.html">picocli</a></h3>
-<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing fields, and an explanation">
-<caption><span>Fields in <a href="../../picocli/package-summary.html">picocli</a> declared as <a href="../../picocli/CommandLine.Help.IParamLabelRenderer.html" title="interface in picocli">CommandLine.Help.IParamLabelRenderer</a></span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colFirst" scope="col">Modifier and Type</th>
-<th class="colLast" scope="col">Field and Description</th>
-</tr>
-<tbody>
-<tr class="altColor">
-<td class="colFirst"><code><a href="../../picocli/CommandLine.Help.IParamLabelRenderer.html" title="interface in picocli">CommandLine.Help.IParamLabelRenderer</a></code></td>
-<td class="colLast"><span class="typeNameLabel">CommandLine.Help.</span><code><span class="memberNameLink"><a href="../../picocli/CommandLine.Help.html#parameterLabelRenderer">parameterLabelRenderer</a></span></code>
-<div class="block">Option and positional parameter value label renderer used for the synopsis line(s) and the option list.</div>
-</td>
-</tr>
-</tbody>
-</table>
-<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing methods, and an explanation">
-<caption><span>Methods in <a href="../../picocli/package-summary.html">picocli</a> that return <a href="../../picocli/CommandLine.Help.IParamLabelRenderer.html" title="interface in picocli">CommandLine.Help.IParamLabelRenderer</a></span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colFirst" scope="col">Modifier and Type</th>
-<th class="colLast" scope="col">Method and Description</th>
-</tr>
-<tbody>
-<tr class="altColor">
-<td class="colFirst"><code><a href="../../picocli/CommandLine.Help.IParamLabelRenderer.html" title="interface in picocli">CommandLine.Help.IParamLabelRenderer</a></code></td>
-<td class="colLast"><span class="typeNameLabel">CommandLine.Help.</span><code><span class="memberNameLink"><a href="../../picocli/CommandLine.Help.html#createDefaultParamLabelRenderer--">createDefaultParamLabelRenderer</a></span>()</code>
-<div class="block">Returns a new default value renderer that separates option parameters from their <a href="../../picocli/CommandLine.Option.html" title="annotation in picocli">options</a> with the specified separator string, surrounds optional parameters with <code>'['</code> and <code>']'</code>
- characters and uses ellipses ("...") to indicate that any number of a parameter are allowed.</div>
-</td>
-</tr>
-<tr class="rowColor">
-<td class="colFirst"><code>static <a href="../../picocli/CommandLine.Help.IParamLabelRenderer.html" title="interface in picocli">CommandLine.Help.IParamLabelRenderer</a></code></td>
-<td class="colLast"><span class="typeNameLabel">CommandLine.Help.</span><code><span class="memberNameLink"><a href="../../picocli/CommandLine.Help.html#createMinimalParamLabelRenderer--">createMinimalParamLabelRenderer</a></span>()</code>
-<div class="block">Returns a value renderer that returns the <code>paramLabel</code> if defined or the field name otherwise.</div>
-</td>
-</tr>
-</tbody>
-</table>
-<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing methods, and an explanation">
-<caption><span>Methods in <a href="../../picocli/package-summary.html">picocli</a> with parameters of type <a href="../../picocli/CommandLine.Help.IParamLabelRenderer.html" title="interface in picocli">CommandLine.Help.IParamLabelRenderer</a></span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colFirst" scope="col">Modifier and Type</th>
-<th class="colLast" scope="col">Method and Description</th>
-</tr>
-<tbody>
-<tr class="altColor">
-<td class="colFirst"><code>void</code></td>
-<td class="colLast"><span class="typeNameLabel">CommandLine.Help.Layout.</span><code><span class="memberNameLink"><a href="../../picocli/CommandLine.Help.Layout.html#addOption-java.lang.reflect.Field-picocli.CommandLine.Help.IParamLabelRenderer-">addOption</a></span>(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/reflect/Field.html?is-external=true" title="class or interface in java.lang.reflect">Field</a>&nbsp;field,
-         <a href="../../picocli/CommandLine.Help.IParamLabelRenderer.html" title="interface in picocli">CommandLine.Help.IParamLabelRenderer</a>&nbsp;paramLabelRenderer)</code>
-<div class="block">Delegates to the <a href="../../picocli/CommandLine.Help.Layout.html#optionRenderer"><code>option renderer</code></a> of this layout to obtain
- text values for the specified <a href="../../picocli/CommandLine.Option.html" title="annotation in picocli"><code>CommandLine.Option</code></a>, and then calls the <code>#layout(Field, Text[][])</code>
- method to write these text values into the correct cells in the TextTable.</div>
-</td>
-</tr>
-<tr class="rowColor">
-<td class="colFirst"><code>void</code></td>
-<td class="colLast"><span class="typeNameLabel">CommandLine.Help.Layout.</span><code><span class="memberNameLink"><a href="../../picocli/CommandLine.Help.Layout.html#addOptions-java.util.List-picocli.CommandLine.Help.IParamLabelRenderer-">addOptions</a></span>(<a href="http://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a>&lt;<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/reflect/Field.html?is-external=true" title="class or interface in java.lang.reflect">Field</a>&gt;&nbsp;fields,
-          <a href="../../picocli/CommandLine.Help.IParamLabelRenderer.html" title="interface in picocli">CommandLine.Help.IParamLabelRenderer</a>&nbsp;paramLabelRenderer)</code>
-<div class="block">Calls <a href="../../picocli/CommandLine.Help.Layout.html#addOption-java.lang.reflect.Field-picocli.CommandLine.Help.IParamLabelRenderer-"><code>CommandLine.Help.Layout.addOption(Field, CommandLine.Help.IParamLabelRenderer)</code></a> for all non-hidden Options in the list.</div>
-</td>
-</tr>
-<tr class="altColor">
-<td class="colFirst"><code>void</code></td>
-<td class="colLast"><span class="typeNameLabel">CommandLine.Help.Layout.</span><code><span class="memberNameLink"><a href="../../picocli/CommandLine.Help.Layout.html#addPositionalParameter-java.lang.reflect.Field-picocli.CommandLine.Help.IParamLabelRenderer-">addPositionalParameter</a></span>(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/reflect/Field.html?is-external=true" title="class or interface in java.lang.reflect">Field</a>&nbsp;field,
-                      <a href="../../picocli/CommandLine.Help.IParamLabelRenderer.html" title="interface in picocli">CommandLine.Help.IParamLabelRenderer</a>&nbsp;paramLabelRenderer)</code>
-<div class="block">Delegates to the <a href="../../picocli/CommandLine.Help.Layout.html#parameterRenderer"><code>parameter renderer</code></a> of this layout
- to obtain text values for the specified <a href="../../picocli/CommandLine.Parameters.html" title="annotation in picocli"><code>CommandLine.Parameters</code></a>, and then calls
- <code>#layout(Field, Text[][])</code> to write these text values into the correct cells in the TextTable.</div>
-</td>
-</tr>
-<tr class="rowColor">
-<td class="colFirst"><code>void</code></td>
-<td class="colLast"><span class="typeNameLabel">CommandLine.Help.Layout.</span><code><span class="memberNameLink"><a href="../../picocli/CommandLine.Help.Layout.html#addPositionalParameters-java.util.List-picocli.CommandLine.Help.IParamLabelRenderer-">addPositionalParameters</a></span>(<a href="http://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a>&lt;<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/reflect/Field.html?is-external=true" title="class or interface in java.lang.reflect">Field</a>&gt;&nbsp;fields,
-                       <a href="../../picocli/CommandLine.Help.IParamLabelRenderer.html" title="interface in picocli">CommandLine.Help.IParamLabelRenderer</a>&nbsp;paramLabelRenderer)</code>
-<div class="block">Calls <a href="../../picocli/CommandLine.Help.Layout.html#addPositionalParameter-java.lang.reflect.Field-picocli.CommandLine.Help.IParamLabelRenderer-"><code>CommandLine.Help.Layout.addPositionalParameter(Field, CommandLine.Help.IParamLabelRenderer)</code></a> for all non-hidden Parameters in the list.</div>
-</td>
-</tr>
-<tr class="altColor">
-<td class="colFirst"><code><a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
-<td class="colLast"><span class="typeNameLabel">CommandLine.Help.</span><code><span class="memberNameLink"><a href="../../picocli/CommandLine.Help.html#optionList-picocli.CommandLine.Help.Layout-java.util.Comparator-picocli.CommandLine.Help.IParamLabelRenderer-">optionList</a></span>(<a href="../../picocli/CommandLine.Help.Layout.html" title="class in picocli">CommandLine.Help.Layout</a>&nbsp;layout,
-          <a href="http://docs.oracle.com/javase/8/docs/api/java/util/Comparator.html?is-external=true" title="class or interface in java.util">Comparator</a>&lt;<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/reflect/Field.html?is-external=true" title="class or interface in java.lang.reflect">Field</a>&gt;&nbsp;optionSort,
-          <a href="../../picocli/CommandLine.Help.IParamLabelRenderer.html" title="interface in picocli">CommandLine.Help.IParamLabelRenderer</a>&nbsp;valueLabelRenderer)</code>
-<div class="block">Sorts all <code>Options</code> with the specified <code>comparator</code> (if the comparator is non-<code>null</code>),
- then <a href="../../picocli/CommandLine.Help.Layout.html#addOption-java.lang.reflect.Field-picocli.CommandLine.Help.IParamLabelRenderer-">adds</a> all non-hidden options to the
- specified TextTable and returns the result of TextTable.toString().</div>
-</td>
-</tr>
-<tr class="rowColor">
-<td class="colFirst"><code><a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
-<td class="colLast"><span class="typeNameLabel">CommandLine.Help.</span><code><span class="memberNameLink"><a href="../../picocli/CommandLine.Help.html#parameterList-picocli.CommandLine.Help.Layout-picocli.CommandLine.Help.IParamLabelRenderer-">parameterList</a></span>(<a href="../../picocli/CommandLine.Help.Layout.html" title="class in picocli">CommandLine.Help.Layout</a>&nbsp;layout,
-             <a href="../../picocli/CommandLine.Help.IParamLabelRenderer.html" title="interface in picocli">CommandLine.Help.IParamLabelRenderer</a>&nbsp;paramLabelRenderer)</code>
-<div class="block">Returns the section of the usage help message that lists the parameters with their descriptions.</div>
-</td>
-</tr>
-<tr class="altColor">
-<td class="colFirst"><code><a href="../../picocli/CommandLine.Help.Ansi.Text.html" title="class in picocli">CommandLine.Help.Ansi.Text</a>[][]</code></td>
-<td class="colLast"><span class="typeNameLabel">CommandLine.Help.IOptionRenderer.</span><code><span class="memberNameLink"><a href="../../picocli/CommandLine.Help.IOptionRenderer.html#render-picocli.CommandLine.Option-java.lang.reflect.Field-picocli.CommandLine.Help.IParamLabelRenderer-picocli.CommandLine.Help.ColorScheme-">render</a></span>(<a href="../../picocli/CommandLine.Option.html" title="annotation in picocli">CommandLine.Option</a>&nbsp;option,
-      <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/reflect/Field.html?is-external=true" title="class or interface in java.lang.reflect">Field</a>&nbsp;field,
-      <a href="../../picocli/CommandLine.Help.IParamLabelRenderer.html" title="interface in picocli">CommandLine.Help.IParamLabelRenderer</a>&nbsp;parameterLabelRenderer,
-      <a href="../../picocli/CommandLine.Help.ColorScheme.html" title="class in picocli">CommandLine.Help.ColorScheme</a>&nbsp;scheme)</code>
-<div class="block">Returns a text representation of the specified Option and the Field that captures the option value.</div>
-</td>
-</tr>
-<tr class="rowColor">
-<td class="colFirst"><code><a href="../../picocli/CommandLine.Help.Ansi.Text.html" title="class in picocli">CommandLine.Help.Ansi.Text</a>[][]</code></td>
-<td class="colLast"><span class="typeNameLabel">CommandLine.Help.IParameterRenderer.</span><code><span class="memberNameLink"><a href="../../picocli/CommandLine.Help.IParameterRenderer.html#render-picocli.CommandLine.Parameters-java.lang.reflect.Field-picocli.CommandLine.Help.IParamLabelRenderer-picocli.CommandLine.Help.ColorScheme-">render</a></span>(<a href="../../picocli/CommandLine.Parameters.html" title="annotation in picocli">CommandLine.Parameters</a>&nbsp;parameters,
-      <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/reflect/Field.html?is-external=true" title="class or interface in java.lang.reflect">Field</a>&nbsp;field,
-      <a href="../../picocli/CommandLine.Help.IParamLabelRenderer.html" title="interface in picocli">CommandLine.Help.IParamLabelRenderer</a>&nbsp;parameterLabelRenderer,
-      <a href="../../picocli/CommandLine.Help.ColorScheme.html" title="class in picocli">CommandLine.Help.ColorScheme</a>&nbsp;scheme)</code>
-<div class="block">Returns a text representation of the specified Parameters and the Field that captures the parameter values.</div>
-</td>
-</tr>
-</tbody>
-</table>
-</li>
-</ul>
-</li>
-</ul>
-</div>
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<div class="bottomNav"><a name="navbar.bottom">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.bottom.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../../picocli/package-summary.html">Package</a></li>
-<li><a href="../../picocli/CommandLine.Help.IParamLabelRenderer.html" title="interface in picocli">Class</a></li>
-<li class="navBarCell1Rev">Use</li>
-<li><a href="../package-tree.html">Tree</a></li>
-<li><a href="../../deprecated-list.html">Deprecated</a></li>
-<li><a href="../../index-all.html">Index</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li>Prev</li>
-<li>Next</li>
-</ul>
-<ul class="navList">
-<li><a href="../../index.html?picocli/class-use/CommandLine.Help.IParamLabelRenderer.html" target="_top">Frames</a></li>
-<li><a href="CommandLine.Help.IParamLabelRenderer.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_bottom">
-<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_bottom");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<a name="skip.navbar.bottom">
-<!--   -->
-</a></div>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-<p class="legalCopy"><small>Copyright &#169; 2017. All rights reserved.</small></p>
-</body>
-</html>
diff --git a/docs/apidocs/picocli/class-use/CommandLine.Help.IParameterRenderer.html b/docs/apidocs/picocli/class-use/CommandLine.Help.IParameterRenderer.html
deleted file mode 100644
index 2ce2a7feb..000000000
--- a/docs/apidocs/picocli/class-use/CommandLine.Help.IParameterRenderer.html
+++ /dev/null
@@ -1,187 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- NewPage -->
-<html lang="en">
-<head>
-<!-- Generated by javadoc (1.8.0_51) on Wed Apr 19 00:59:45 JST 2017 -->
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Uses of Interface picocli.CommandLine.Help.IParameterRenderer (picocli 0.9.1 API)</title>
-<meta name="date" content="2017-04-19">
-<link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
-<script type="text/javascript" src="../../script.js"></script>
-</head>
-<body>
-<script type="text/javascript"><!--
-    try {
-        if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Uses of Interface picocli.CommandLine.Help.IParameterRenderer (picocli 0.9.1 API)";
-        }
-    }
-    catch(err) {
-    }
-//-->
-</script>
-<noscript>
-<div>JavaScript is disabled on your browser.</div>
-</noscript>
-<!-- ========= START OF TOP NAVBAR ======= -->
-<div class="topNav"><a name="navbar.top">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.top.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../../picocli/package-summary.html">Package</a></li>
-<li><a href="../../picocli/CommandLine.Help.IParameterRenderer.html" title="interface in picocli">Class</a></li>
-<li class="navBarCell1Rev">Use</li>
-<li><a href="../package-tree.html">Tree</a></li>
-<li><a href="../../deprecated-list.html">Deprecated</a></li>
-<li><a href="../../index-all.html">Index</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li>Prev</li>
-<li>Next</li>
-</ul>
-<ul class="navList">
-<li><a href="../../index.html?picocli/class-use/CommandLine.Help.IParameterRenderer.html" target="_top">Frames</a></li>
-<li><a href="CommandLine.Help.IParameterRenderer.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_top">
-<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_top");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<a name="skip.navbar.top">
-<!--   -->
-</a></div>
-<!-- ========= END OF TOP NAVBAR ========= -->
-<div class="header">
-<h2 title="Uses of Interface picocli.CommandLine.Help.IParameterRenderer" class="title">Uses of Interface<br>picocli.CommandLine.Help.IParameterRenderer</h2>
-</div>
-<div class="classUseContainer">
-<ul class="blockList">
-<li class="blockList">
-<ul class="blockList">
-<li class="blockList"><a name="picocli">
-<!--   -->
-</a>
-<h3>Uses of <a href="../../picocli/CommandLine.Help.IParameterRenderer.html" title="interface in picocli">CommandLine.Help.IParameterRenderer</a> in <a href="../../picocli/package-summary.html">picocli</a></h3>
-<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing fields, and an explanation">
-<caption><span>Fields in <a href="../../picocli/package-summary.html">picocli</a> declared as <a href="../../picocli/CommandLine.Help.IParameterRenderer.html" title="interface in picocli">CommandLine.Help.IParameterRenderer</a></span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colFirst" scope="col">Modifier and Type</th>
-<th class="colLast" scope="col">Field and Description</th>
-</tr>
-<tbody>
-<tr class="altColor">
-<td class="colFirst"><code>protected <a href="../../picocli/CommandLine.Help.IParameterRenderer.html" title="interface in picocli">CommandLine.Help.IParameterRenderer</a></code></td>
-<td class="colLast"><span class="typeNameLabel">CommandLine.Help.Layout.</span><code><span class="memberNameLink"><a href="../../picocli/CommandLine.Help.Layout.html#parameterRenderer">parameterRenderer</a></span></code>&nbsp;</td>
-</tr>
-</tbody>
-</table>
-<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing methods, and an explanation">
-<caption><span>Methods in <a href="../../picocli/package-summary.html">picocli</a> that return <a href="../../picocli/CommandLine.Help.IParameterRenderer.html" title="interface in picocli">CommandLine.Help.IParameterRenderer</a></span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colFirst" scope="col">Modifier and Type</th>
-<th class="colLast" scope="col">Method and Description</th>
-</tr>
-<tbody>
-<tr class="altColor">
-<td class="colFirst"><code><a href="../../picocli/CommandLine.Help.IParameterRenderer.html" title="interface in picocli">CommandLine.Help.IParameterRenderer</a></code></td>
-<td class="colLast"><span class="typeNameLabel">CommandLine.Help.</span><code><span class="memberNameLink"><a href="../../picocli/CommandLine.Help.html#createDefaultParameterRenderer--">createDefaultParameterRenderer</a></span>()</code>
-<div class="block">Returns a new default ParameterRenderer which converts <a href="../../picocli/CommandLine.Parameters.html" title="annotation in picocli"><code>Parameters</code></a> to four columns of
- text to match the default <a href="../../picocli/CommandLine.Help.TextTable.html" title="class in picocli">TextTable</a> column layout.</div>
-</td>
-</tr>
-<tr class="rowColor">
-<td class="colFirst"><code>static <a href="../../picocli/CommandLine.Help.IParameterRenderer.html" title="interface in picocli">CommandLine.Help.IParameterRenderer</a></code></td>
-<td class="colLast"><span class="typeNameLabel">CommandLine.Help.</span><code><span class="memberNameLink"><a href="../../picocli/CommandLine.Help.html#createMinimalParameterRenderer--">createMinimalParameterRenderer</a></span>()</code>
-<div class="block">Returns a new minimal ParameterRenderer which converts <a href="../../picocli/CommandLine.Parameters.html" title="annotation in picocli"><code>Parameters</code></a> to a single row with
- two columns of text: an option name and a description.</div>
-</td>
-</tr>
-</tbody>
-</table>
-<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing constructors, and an explanation">
-<caption><span>Constructors in <a href="../../picocli/package-summary.html">picocli</a> with parameters of type <a href="../../picocli/CommandLine.Help.IParameterRenderer.html" title="interface in picocli">CommandLine.Help.IParameterRenderer</a></span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colOne" scope="col">Constructor and Description</th>
-</tr>
-<tbody>
-<tr class="altColor">
-<td class="colLast"><code><span class="memberNameLink"><a href="../../picocli/CommandLine.Help.Layout.html#Layout-picocli.CommandLine.Help.ColorScheme-picocli.CommandLine.Help.TextTable-picocli.CommandLine.Help.IOptionRenderer-picocli.CommandLine.Help.IParameterRenderer-">Layout</a></span>(<a href="../../picocli/CommandLine.Help.ColorScheme.html" title="class in picocli">CommandLine.Help.ColorScheme</a>&nbsp;colorScheme,
-      <a href="../../picocli/CommandLine.Help.TextTable.html" title="class in picocli">CommandLine.Help.TextTable</a>&nbsp;textTable,
-      <a href="../../picocli/CommandLine.Help.IOptionRenderer.html" title="interface in picocli">CommandLine.Help.IOptionRenderer</a>&nbsp;optionRenderer,
-      <a href="../../picocli/CommandLine.Help.IParameterRenderer.html" title="interface in picocli">CommandLine.Help.IParameterRenderer</a>&nbsp;parameterRenderer)</code>
-<div class="block">Constructs a Layout with the specified color scheme, the specified TextTable, the
- specified option renderer and the specified parameter renderer.</div>
-</td>
-</tr>
-</tbody>
-</table>
-</li>
-</ul>
-</li>
-</ul>
-</div>
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<div class="bottomNav"><a name="navbar.bottom">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.bottom.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../../picocli/package-summary.html">Package</a></li>
-<li><a href="../../picocli/CommandLine.Help.IParameterRenderer.html" title="interface in picocli">Class</a></li>
-<li class="navBarCell1Rev">Use</li>
-<li><a href="../package-tree.html">Tree</a></li>
-<li><a href="../../deprecated-list.html">Deprecated</a></li>
-<li><a href="../../index-all.html">Index</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li>Prev</li>
-<li>Next</li>
-</ul>
-<ul class="navList">
-<li><a href="../../index.html?picocli/class-use/CommandLine.Help.IParameterRenderer.html" target="_top">Frames</a></li>
-<li><a href="CommandLine.Help.IParameterRenderer.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_bottom">
-<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_bottom");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<a name="skip.navbar.bottom">
-<!--   -->
-</a></div>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-<p class="legalCopy"><small>Copyright &#169; 2017. All rights reserved.</small></p>
-</body>
-</html>
diff --git a/docs/apidocs/picocli/class-use/CommandLine.Help.Layout.html b/docs/apidocs/picocli/class-use/CommandLine.Help.Layout.html
deleted file mode 100644
index cd978706a..000000000
--- a/docs/apidocs/picocli/class-use/CommandLine.Help.Layout.html
+++ /dev/null
@@ -1,175 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- NewPage -->
-<html lang="en">
-<head>
-<!-- Generated by javadoc (1.8.0_51) on Wed Apr 19 00:59:45 JST 2017 -->
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Uses of Class picocli.CommandLine.Help.Layout (picocli 0.9.1 API)</title>
-<meta name="date" content="2017-04-19">
-<link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
-<script type="text/javascript" src="../../script.js"></script>
-</head>
-<body>
-<script type="text/javascript"><!--
-    try {
-        if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Uses of Class picocli.CommandLine.Help.Layout (picocli 0.9.1 API)";
-        }
-    }
-    catch(err) {
-    }
-//-->
-</script>
-<noscript>
-<div>JavaScript is disabled on your browser.</div>
-</noscript>
-<!-- ========= START OF TOP NAVBAR ======= -->
-<div class="topNav"><a name="navbar.top">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.top.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../../picocli/package-summary.html">Package</a></li>
-<li><a href="../../picocli/CommandLine.Help.Layout.html" title="class in picocli">Class</a></li>
-<li class="navBarCell1Rev">Use</li>
-<li><a href="../package-tree.html">Tree</a></li>
-<li><a href="../../deprecated-list.html">Deprecated</a></li>
-<li><a href="../../index-all.html">Index</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li>Prev</li>
-<li>Next</li>
-</ul>
-<ul class="navList">
-<li><a href="../../index.html?picocli/class-use/CommandLine.Help.Layout.html" target="_top">Frames</a></li>
-<li><a href="CommandLine.Help.Layout.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_top">
-<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_top");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<a name="skip.navbar.top">
-<!--   -->
-</a></div>
-<!-- ========= END OF TOP NAVBAR ========= -->
-<div class="header">
-<h2 title="Uses of Class picocli.CommandLine.Help.Layout" class="title">Uses of Class<br>picocli.CommandLine.Help.Layout</h2>
-</div>
-<div class="classUseContainer">
-<ul class="blockList">
-<li class="blockList">
-<ul class="blockList">
-<li class="blockList"><a name="picocli">
-<!--   -->
-</a>
-<h3>Uses of <a href="../../picocli/CommandLine.Help.Layout.html" title="class in picocli">CommandLine.Help.Layout</a> in <a href="../../picocli/package-summary.html">picocli</a></h3>
-<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing methods, and an explanation">
-<caption><span>Methods in <a href="../../picocli/package-summary.html">picocli</a> that return <a href="../../picocli/CommandLine.Help.Layout.html" title="class in picocli">CommandLine.Help.Layout</a></span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colFirst" scope="col">Modifier and Type</th>
-<th class="colLast" scope="col">Method and Description</th>
-</tr>
-<tbody>
-<tr class="altColor">
-<td class="colFirst"><code><a href="../../picocli/CommandLine.Help.Layout.html" title="class in picocli">CommandLine.Help.Layout</a></code></td>
-<td class="colLast"><span class="typeNameLabel">CommandLine.Help.</span><code><span class="memberNameLink"><a href="../../picocli/CommandLine.Help.html#createDefaultLayout--">createDefaultLayout</a></span>()</code>
-<div class="block">Returns a <code>Layout</code> instance configured with the user preferences captured in this Help instance.</div>
-</td>
-</tr>
-</tbody>
-</table>
-<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing methods, and an explanation">
-<caption><span>Methods in <a href="../../picocli/package-summary.html">picocli</a> with parameters of type <a href="../../picocli/CommandLine.Help.Layout.html" title="class in picocli">CommandLine.Help.Layout</a></span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colFirst" scope="col">Modifier and Type</th>
-<th class="colLast" scope="col">Method and Description</th>
-</tr>
-<tbody>
-<tr class="altColor">
-<td class="colFirst"><code><a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
-<td class="colLast"><span class="typeNameLabel">CommandLine.Help.</span><code><span class="memberNameLink"><a href="../../picocli/CommandLine.Help.html#optionList-picocli.CommandLine.Help.Layout-java.util.Comparator-picocli.CommandLine.Help.IParamLabelRenderer-">optionList</a></span>(<a href="../../picocli/CommandLine.Help.Layout.html" title="class in picocli">CommandLine.Help.Layout</a>&nbsp;layout,
-          <a href="http://docs.oracle.com/javase/8/docs/api/java/util/Comparator.html?is-external=true" title="class or interface in java.util">Comparator</a>&lt;<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/reflect/Field.html?is-external=true" title="class or interface in java.lang.reflect">Field</a>&gt;&nbsp;optionSort,
-          <a href="../../picocli/CommandLine.Help.IParamLabelRenderer.html" title="interface in picocli">CommandLine.Help.IParamLabelRenderer</a>&nbsp;valueLabelRenderer)</code>
-<div class="block">Sorts all <code>Options</code> with the specified <code>comparator</code> (if the comparator is non-<code>null</code>),
- then <a href="../../picocli/CommandLine.Help.Layout.html#addOption-java.lang.reflect.Field-picocli.CommandLine.Help.IParamLabelRenderer-">adds</a> all non-hidden options to the
- specified TextTable and returns the result of TextTable.toString().</div>
-</td>
-</tr>
-<tr class="rowColor">
-<td class="colFirst"><code><a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
-<td class="colLast"><span class="typeNameLabel">CommandLine.Help.</span><code><span class="memberNameLink"><a href="../../picocli/CommandLine.Help.html#parameterList-picocli.CommandLine.Help.Layout-picocli.CommandLine.Help.IParamLabelRenderer-">parameterList</a></span>(<a href="../../picocli/CommandLine.Help.Layout.html" title="class in picocli">CommandLine.Help.Layout</a>&nbsp;layout,
-             <a href="../../picocli/CommandLine.Help.IParamLabelRenderer.html" title="interface in picocli">CommandLine.Help.IParamLabelRenderer</a>&nbsp;paramLabelRenderer)</code>
-<div class="block">Returns the section of the usage help message that lists the parameters with their descriptions.</div>
-</td>
-</tr>
-</tbody>
-</table>
-</li>
-</ul>
-</li>
-</ul>
-</div>
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<div class="bottomNav"><a name="navbar.bottom">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.bottom.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../../picocli/package-summary.html">Package</a></li>
-<li><a href="../../picocli/CommandLine.Help.Layout.html" title="class in picocli">Class</a></li>
-<li class="navBarCell1Rev">Use</li>
-<li><a href="../package-tree.html">Tree</a></li>
-<li><a href="../../deprecated-list.html">Deprecated</a></li>
-<li><a href="../../index-all.html">Index</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li>Prev</li>
-<li>Next</li>
-</ul>
-<ul class="navList">
-<li><a href="../../index.html?picocli/class-use/CommandLine.Help.Layout.html" target="_top">Frames</a></li>
-<li><a href="CommandLine.Help.Layout.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_bottom">
-<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_bottom");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<a name="skip.navbar.bottom">
-<!--   -->
-</a></div>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-<p class="legalCopy"><small>Copyright &#169; 2017. All rights reserved.</small></p>
-</body>
-</html>
diff --git a/docs/apidocs/picocli/class-use/CommandLine.Help.TextTable.html b/docs/apidocs/picocli/class-use/CommandLine.Help.TextTable.html
deleted file mode 100644
index 9bef66b80..000000000
--- a/docs/apidocs/picocli/class-use/CommandLine.Help.TextTable.html
+++ /dev/null
@@ -1,172 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- NewPage -->
-<html lang="en">
-<head>
-<!-- Generated by javadoc (1.8.0_51) on Wed Apr 19 00:59:45 JST 2017 -->
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Uses of Class picocli.CommandLine.Help.TextTable (picocli 0.9.1 API)</title>
-<meta name="date" content="2017-04-19">
-<link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
-<script type="text/javascript" src="../../script.js"></script>
-</head>
-<body>
-<script type="text/javascript"><!--
-    try {
-        if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Uses of Class picocli.CommandLine.Help.TextTable (picocli 0.9.1 API)";
-        }
-    }
-    catch(err) {
-    }
-//-->
-</script>
-<noscript>
-<div>JavaScript is disabled on your browser.</div>
-</noscript>
-<!-- ========= START OF TOP NAVBAR ======= -->
-<div class="topNav"><a name="navbar.top">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.top.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../../picocli/package-summary.html">Package</a></li>
-<li><a href="../../picocli/CommandLine.Help.TextTable.html" title="class in picocli">Class</a></li>
-<li class="navBarCell1Rev">Use</li>
-<li><a href="../package-tree.html">Tree</a></li>
-<li><a href="../../deprecated-list.html">Deprecated</a></li>
-<li><a href="../../index-all.html">Index</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li>Prev</li>
-<li>Next</li>
-</ul>
-<ul class="navList">
-<li><a href="../../index.html?picocli/class-use/CommandLine.Help.TextTable.html" target="_top">Frames</a></li>
-<li><a href="CommandLine.Help.TextTable.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_top">
-<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_top");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<a name="skip.navbar.top">
-<!--   -->
-</a></div>
-<!-- ========= END OF TOP NAVBAR ========= -->
-<div class="header">
-<h2 title="Uses of Class picocli.CommandLine.Help.TextTable" class="title">Uses of Class<br>picocli.CommandLine.Help.TextTable</h2>
-</div>
-<div class="classUseContainer">
-<ul class="blockList">
-<li class="blockList">
-<ul class="blockList">
-<li class="blockList"><a name="picocli">
-<!--   -->
-</a>
-<h3>Uses of <a href="../../picocli/CommandLine.Help.TextTable.html" title="class in picocli">CommandLine.Help.TextTable</a> in <a href="../../picocli/package-summary.html">picocli</a></h3>
-<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing fields, and an explanation">
-<caption><span>Fields in <a href="../../picocli/package-summary.html">picocli</a> declared as <a href="../../picocli/CommandLine.Help.TextTable.html" title="class in picocli">CommandLine.Help.TextTable</a></span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colFirst" scope="col">Modifier and Type</th>
-<th class="colLast" scope="col">Field and Description</th>
-</tr>
-<tbody>
-<tr class="altColor">
-<td class="colFirst"><code>protected <a href="../../picocli/CommandLine.Help.TextTable.html" title="class in picocli">CommandLine.Help.TextTable</a></code></td>
-<td class="colLast"><span class="typeNameLabel">CommandLine.Help.Layout.</span><code><span class="memberNameLink"><a href="../../picocli/CommandLine.Help.Layout.html#table">table</a></span></code>&nbsp;</td>
-</tr>
-</tbody>
-</table>
-<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing constructors, and an explanation">
-<caption><span>Constructors in <a href="../../picocli/package-summary.html">picocli</a> with parameters of type <a href="../../picocli/CommandLine.Help.TextTable.html" title="class in picocli">CommandLine.Help.TextTable</a></span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colOne" scope="col">Constructor and Description</th>
-</tr>
-<tbody>
-<tr class="altColor">
-<td class="colLast"><code><span class="memberNameLink"><a href="../../picocli/CommandLine.Help.Layout.html#Layout-picocli.CommandLine.Help.ColorScheme-picocli.CommandLine.Help.TextTable-">Layout</a></span>(<a href="../../picocli/CommandLine.Help.ColorScheme.html" title="class in picocli">CommandLine.Help.ColorScheme</a>&nbsp;colorScheme,
-      <a href="../../picocli/CommandLine.Help.TextTable.html" title="class in picocli">CommandLine.Help.TextTable</a>&nbsp;textTable)</code>
-<div class="block">Constructs a Layout with the specified color scheme, the specified TextTable, the
- <a href="../../picocli/CommandLine.Help.html#createDefaultOptionRenderer--">default option renderer</a>, and the
- <a href="../../picocli/CommandLine.Help.html#createDefaultParameterRenderer--">default parameter renderer</a>.</div>
-</td>
-</tr>
-<tr class="rowColor">
-<td class="colLast"><code><span class="memberNameLink"><a href="../../picocli/CommandLine.Help.Layout.html#Layout-picocli.CommandLine.Help.ColorScheme-picocli.CommandLine.Help.TextTable-picocli.CommandLine.Help.IOptionRenderer-picocli.CommandLine.Help.IParameterRenderer-">Layout</a></span>(<a href="../../picocli/CommandLine.Help.ColorScheme.html" title="class in picocli">CommandLine.Help.ColorScheme</a>&nbsp;colorScheme,
-      <a href="../../picocli/CommandLine.Help.TextTable.html" title="class in picocli">CommandLine.Help.TextTable</a>&nbsp;textTable,
-      <a href="../../picocli/CommandLine.Help.IOptionRenderer.html" title="interface in picocli">CommandLine.Help.IOptionRenderer</a>&nbsp;optionRenderer,
-      <a href="../../picocli/CommandLine.Help.IParameterRenderer.html" title="interface in picocli">CommandLine.Help.IParameterRenderer</a>&nbsp;parameterRenderer)</code>
-<div class="block">Constructs a Layout with the specified color scheme, the specified TextTable, the
- specified option renderer and the specified parameter renderer.</div>
-</td>
-</tr>
-</tbody>
-</table>
-</li>
-</ul>
-</li>
-</ul>
-</div>
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<div class="bottomNav"><a name="navbar.bottom">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.bottom.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../../picocli/package-summary.html">Package</a></li>
-<li><a href="../../picocli/CommandLine.Help.TextTable.html" title="class in picocli">Class</a></li>
-<li class="navBarCell1Rev">Use</li>
-<li><a href="../package-tree.html">Tree</a></li>
-<li><a href="../../deprecated-list.html">Deprecated</a></li>
-<li><a href="../../index-all.html">Index</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li>Prev</li>
-<li>Next</li>
-</ul>
-<ul class="navList">
-<li><a href="../../index.html?picocli/class-use/CommandLine.Help.TextTable.html" target="_top">Frames</a></li>
-<li><a href="CommandLine.Help.TextTable.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_bottom">
-<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_bottom");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<a name="skip.navbar.bottom">
-<!--   -->
-</a></div>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-<p class="legalCopy"><small>Copyright &#169; 2017. All rights reserved.</small></p>
-</body>
-</html>
diff --git a/docs/apidocs/picocli/class-use/CommandLine.Help.html b/docs/apidocs/picocli/class-use/CommandLine.Help.html
deleted file mode 100644
index 89e57c7db..000000000
--- a/docs/apidocs/picocli/class-use/CommandLine.Help.html
+++ /dev/null
@@ -1,156 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- NewPage -->
-<html lang="en">
-<head>
-<!-- Generated by javadoc (1.8.0_51) on Wed Apr 19 00:59:45 JST 2017 -->
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Uses of Class picocli.CommandLine.Help (picocli 0.9.1 API)</title>
-<meta name="date" content="2017-04-19">
-<link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
-<script type="text/javascript" src="../../script.js"></script>
-</head>
-<body>
-<script type="text/javascript"><!--
-    try {
-        if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Uses of Class picocli.CommandLine.Help (picocli 0.9.1 API)";
-        }
-    }
-    catch(err) {
-    }
-//-->
-</script>
-<noscript>
-<div>JavaScript is disabled on your browser.</div>
-</noscript>
-<!-- ========= START OF TOP NAVBAR ======= -->
-<div class="topNav"><a name="navbar.top">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.top.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../../picocli/package-summary.html">Package</a></li>
-<li><a href="../../picocli/CommandLine.Help.html" title="class in picocli">Class</a></li>
-<li class="navBarCell1Rev">Use</li>
-<li><a href="../package-tree.html">Tree</a></li>
-<li><a href="../../deprecated-list.html">Deprecated</a></li>
-<li><a href="../../index-all.html">Index</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li>Prev</li>
-<li>Next</li>
-</ul>
-<ul class="navList">
-<li><a href="../../index.html?picocli/class-use/CommandLine.Help.html" target="_top">Frames</a></li>
-<li><a href="CommandLine.Help.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_top">
-<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_top");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<a name="skip.navbar.top">
-<!--   -->
-</a></div>
-<!-- ========= END OF TOP NAVBAR ========= -->
-<div class="header">
-<h2 title="Uses of Class picocli.CommandLine.Help" class="title">Uses of Class<br>picocli.CommandLine.Help</h2>
-</div>
-<div class="classUseContainer">
-<ul class="blockList">
-<li class="blockList">
-<ul class="blockList">
-<li class="blockList"><a name="picocli">
-<!--   -->
-</a>
-<h3>Uses of <a href="../../picocli/CommandLine.Help.html" title="class in picocli">CommandLine.Help</a> in <a href="../../picocli/package-summary.html">picocli</a></h3>
-<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing methods, and an explanation">
-<caption><span>Methods in <a href="../../picocli/package-summary.html">picocli</a> that return <a href="../../picocli/CommandLine.Help.html" title="class in picocli">CommandLine.Help</a></span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colFirst" scope="col">Modifier and Type</th>
-<th class="colLast" scope="col">Method and Description</th>
-</tr>
-<tbody>
-<tr class="altColor">
-<td class="colFirst"><code><a href="../../picocli/CommandLine.Help.html" title="class in picocli">CommandLine.Help</a></code></td>
-<td class="colLast"><span class="typeNameLabel">CommandLine.Help.</span><code><span class="memberNameLink"><a href="../../picocli/CommandLine.Help.html#addAllCommands-java.util.Map-">addAllCommands</a></span>(<a href="http://docs.oracle.com/javase/8/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util">Map</a>&lt;<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>,<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&gt;&nbsp;commands)</code>
-<div class="block">Registers all specified commands with this Help.</div>
-</td>
-</tr>
-<tr class="rowColor">
-<td class="colFirst"><code><a href="../../picocli/CommandLine.Help.html" title="class in picocli">CommandLine.Help</a></code></td>
-<td class="colLast"><span class="typeNameLabel">CommandLine.Help.</span><code><span class="memberNameLink"><a href="../../picocli/CommandLine.Help.html#addCommand-java.lang.String-java.lang.Object-">addCommand</a></span>(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;command,
-          <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&nbsp;annotatedObject)</code>
-<div class="block">Registers the specified command with this Help.</div>
-</td>
-</tr>
-</tbody>
-</table>
-</li>
-</ul>
-</li>
-</ul>
-</div>
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<div class="bottomNav"><a name="navbar.bottom">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.bottom.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../../picocli/package-summary.html">Package</a></li>
-<li><a href="../../picocli/CommandLine.Help.html" title="class in picocli">Class</a></li>
-<li class="navBarCell1Rev">Use</li>
-<li><a href="../package-tree.html">Tree</a></li>
-<li><a href="../../deprecated-list.html">Deprecated</a></li>
-<li><a href="../../index-all.html">Index</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li>Prev</li>
-<li>Next</li>
-</ul>
-<ul class="navList">
-<li><a href="../../index.html?picocli/class-use/CommandLine.Help.html" target="_top">Frames</a></li>
-<li><a href="CommandLine.Help.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_bottom">
-<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_bottom");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<a name="skip.navbar.bottom">
-<!--   -->
-</a></div>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-<p class="legalCopy"><small>Copyright &#169; 2017. All rights reserved.</small></p>
-</body>
-</html>
diff --git a/docs/apidocs/picocli/class-use/CommandLine.ITypeConverter.html b/docs/apidocs/picocli/class-use/CommandLine.ITypeConverter.html
deleted file mode 100644
index 337263e0b..000000000
--- a/docs/apidocs/picocli/class-use/CommandLine.ITypeConverter.html
+++ /dev/null
@@ -1,150 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- NewPage -->
-<html lang="en">
-<head>
-<!-- Generated by javadoc (1.8.0_51) on Wed Apr 19 00:59:45 JST 2017 -->
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Uses of Interface picocli.CommandLine.ITypeConverter (picocli 0.9.1 API)</title>
-<meta name="date" content="2017-04-19">
-<link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
-<script type="text/javascript" src="../../script.js"></script>
-</head>
-<body>
-<script type="text/javascript"><!--
-    try {
-        if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Uses of Interface picocli.CommandLine.ITypeConverter (picocli 0.9.1 API)";
-        }
-    }
-    catch(err) {
-    }
-//-->
-</script>
-<noscript>
-<div>JavaScript is disabled on your browser.</div>
-</noscript>
-<!-- ========= START OF TOP NAVBAR ======= -->
-<div class="topNav"><a name="navbar.top">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.top.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../../picocli/package-summary.html">Package</a></li>
-<li><a href="../../picocli/CommandLine.ITypeConverter.html" title="interface in picocli">Class</a></li>
-<li class="navBarCell1Rev">Use</li>
-<li><a href="../package-tree.html">Tree</a></li>
-<li><a href="../../deprecated-list.html">Deprecated</a></li>
-<li><a href="../../index-all.html">Index</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li>Prev</li>
-<li>Next</li>
-</ul>
-<ul class="navList">
-<li><a href="../../index.html?picocli/class-use/CommandLine.ITypeConverter.html" target="_top">Frames</a></li>
-<li><a href="CommandLine.ITypeConverter.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_top">
-<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_top");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<a name="skip.navbar.top">
-<!--   -->
-</a></div>
-<!-- ========= END OF TOP NAVBAR ========= -->
-<div class="header">
-<h2 title="Uses of Interface picocli.CommandLine.ITypeConverter" class="title">Uses of Interface<br>picocli.CommandLine.ITypeConverter</h2>
-</div>
-<div class="classUseContainer">
-<ul class="blockList">
-<li class="blockList">
-<ul class="blockList">
-<li class="blockList"><a name="picocli">
-<!--   -->
-</a>
-<h3>Uses of <a href="../../picocli/CommandLine.ITypeConverter.html" title="interface in picocli">CommandLine.ITypeConverter</a> in <a href="../../picocli/package-summary.html">picocli</a></h3>
-<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing methods, and an explanation">
-<caption><span>Methods in <a href="../../picocli/package-summary.html">picocli</a> with parameters of type <a href="../../picocli/CommandLine.ITypeConverter.html" title="interface in picocli">CommandLine.ITypeConverter</a></span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colFirst" scope="col">Modifier and Type</th>
-<th class="colLast" scope="col">Method and Description</th>
-</tr>
-<tbody>
-<tr class="altColor">
-<td class="colFirst"><code>&lt;K&gt;&nbsp;<a href="../../picocli/CommandLine.html" title="class in picocli">CommandLine</a></code></td>
-<td class="colLast"><span class="typeNameLabel">CommandLine.</span><code><span class="memberNameLink"><a href="../../picocli/CommandLine.html#registerConverter-java.lang.Class-picocli.CommandLine.ITypeConverter-">registerConverter</a></span>(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a>&lt;K&gt;&nbsp;cls,
-                 <a href="../../picocli/CommandLine.ITypeConverter.html" title="interface in picocli">CommandLine.ITypeConverter</a>&lt;K&gt;&nbsp;converter)</code>
-<div class="block">Registers the specified type converter for the specified class.</div>
-</td>
-</tr>
-</tbody>
-</table>
-</li>
-</ul>
-</li>
-</ul>
-</div>
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<div class="bottomNav"><a name="navbar.bottom">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.bottom.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../../picocli/package-summary.html">Package</a></li>
-<li><a href="../../picocli/CommandLine.ITypeConverter.html" title="interface in picocli">Class</a></li>
-<li class="navBarCell1Rev">Use</li>
-<li><a href="../package-tree.html">Tree</a></li>
-<li><a href="../../deprecated-list.html">Deprecated</a></li>
-<li><a href="../../index-all.html">Index</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li>Prev</li>
-<li>Next</li>
-</ul>
-<ul class="navList">
-<li><a href="../../index.html?picocli/class-use/CommandLine.ITypeConverter.html" target="_top">Frames</a></li>
-<li><a href="CommandLine.ITypeConverter.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_bottom">
-<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_bottom");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<a name="skip.navbar.bottom">
-<!--   -->
-</a></div>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-<p class="legalCopy"><small>Copyright &#169; 2017. All rights reserved.</small></p>
-</body>
-</html>
diff --git a/docs/apidocs/picocli/class-use/CommandLine.MissingParameterException.html b/docs/apidocs/picocli/class-use/CommandLine.MissingParameterException.html
deleted file mode 100644
index 97a15a4f0..000000000
--- a/docs/apidocs/picocli/class-use/CommandLine.MissingParameterException.html
+++ /dev/null
@@ -1,122 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- NewPage -->
-<html lang="en">
-<head>
-<!-- Generated by javadoc (1.8.0_51) on Wed Apr 19 00:59:45 JST 2017 -->
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Uses of Class picocli.CommandLine.MissingParameterException (picocli 0.9.1 API)</title>
-<meta name="date" content="2017-04-19">
-<link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
-<script type="text/javascript" src="../../script.js"></script>
-</head>
-<body>
-<script type="text/javascript"><!--
-    try {
-        if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Uses of Class picocli.CommandLine.MissingParameterException (picocli 0.9.1 API)";
-        }
-    }
-    catch(err) {
-    }
-//-->
-</script>
-<noscript>
-<div>JavaScript is disabled on your browser.</div>
-</noscript>
-<!-- ========= START OF TOP NAVBAR ======= -->
-<div class="topNav"><a name="navbar.top">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.top.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../../picocli/package-summary.html">Package</a></li>
-<li><a href="../../picocli/CommandLine.MissingParameterException.html" title="class in picocli">Class</a></li>
-<li class="navBarCell1Rev">Use</li>
-<li><a href="../package-tree.html">Tree</a></li>
-<li><a href="../../deprecated-list.html">Deprecated</a></li>
-<li><a href="../../index-all.html">Index</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li>Prev</li>
-<li>Next</li>
-</ul>
-<ul class="navList">
-<li><a href="../../index.html?picocli/class-use/CommandLine.MissingParameterException.html" target="_top">Frames</a></li>
-<li><a href="CommandLine.MissingParameterException.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_top">
-<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_top");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<a name="skip.navbar.top">
-<!--   -->
-</a></div>
-<!-- ========= END OF TOP NAVBAR ========= -->
-<div class="header">
-<h2 title="Uses of Class picocli.CommandLine.MissingParameterException" class="title">Uses of Class<br>picocli.CommandLine.MissingParameterException</h2>
-</div>
-<div class="classUseContainer">No usage of picocli.CommandLine.MissingParameterException</div>
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<div class="bottomNav"><a name="navbar.bottom">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.bottom.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../../picocli/package-summary.html">Package</a></li>
-<li><a href="../../picocli/CommandLine.MissingParameterException.html" title="class in picocli">Class</a></li>
-<li class="navBarCell1Rev">Use</li>
-<li><a href="../package-tree.html">Tree</a></li>
-<li><a href="../../deprecated-list.html">Deprecated</a></li>
-<li><a href="../../index-all.html">Index</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li>Prev</li>
-<li>Next</li>
-</ul>
-<ul class="navList">
-<li><a href="../../index.html?picocli/class-use/CommandLine.MissingParameterException.html" target="_top">Frames</a></li>
-<li><a href="CommandLine.MissingParameterException.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_bottom">
-<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_bottom");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<a name="skip.navbar.bottom">
-<!--   -->
-</a></div>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-<p class="legalCopy"><small>Copyright &#169; 2017. All rights reserved.</small></p>
-</body>
-</html>
diff --git a/docs/apidocs/picocli/class-use/CommandLine.MissingTypeConverterException.html b/docs/apidocs/picocli/class-use/CommandLine.MissingTypeConverterException.html
deleted file mode 100644
index c4aced36e..000000000
--- a/docs/apidocs/picocli/class-use/CommandLine.MissingTypeConverterException.html
+++ /dev/null
@@ -1,122 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- NewPage -->
-<html lang="en">
-<head>
-<!-- Generated by javadoc (1.8.0_51) on Wed Apr 19 00:59:45 JST 2017 -->
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Uses of Class picocli.CommandLine.MissingTypeConverterException (picocli 0.9.1 API)</title>
-<meta name="date" content="2017-04-19">
-<link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
-<script type="text/javascript" src="../../script.js"></script>
-</head>
-<body>
-<script type="text/javascript"><!--
-    try {
-        if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Uses of Class picocli.CommandLine.MissingTypeConverterException (picocli 0.9.1 API)";
-        }
-    }
-    catch(err) {
-    }
-//-->
-</script>
-<noscript>
-<div>JavaScript is disabled on your browser.</div>
-</noscript>
-<!-- ========= START OF TOP NAVBAR ======= -->
-<div class="topNav"><a name="navbar.top">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.top.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../../picocli/package-summary.html">Package</a></li>
-<li><a href="../../picocli/CommandLine.MissingTypeConverterException.html" title="class in picocli">Class</a></li>
-<li class="navBarCell1Rev">Use</li>
-<li><a href="../package-tree.html">Tree</a></li>
-<li><a href="../../deprecated-list.html">Deprecated</a></li>
-<li><a href="../../index-all.html">Index</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li>Prev</li>
-<li>Next</li>
-</ul>
-<ul class="navList">
-<li><a href="../../index.html?picocli/class-use/CommandLine.MissingTypeConverterException.html" target="_top">Frames</a></li>
-<li><a href="CommandLine.MissingTypeConverterException.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_top">
-<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_top");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<a name="skip.navbar.top">
-<!--   -->
-</a></div>
-<!-- ========= END OF TOP NAVBAR ========= -->
-<div class="header">
-<h2 title="Uses of Class picocli.CommandLine.MissingTypeConverterException" class="title">Uses of Class<br>picocli.CommandLine.MissingTypeConverterException</h2>
-</div>
-<div class="classUseContainer">No usage of picocli.CommandLine.MissingTypeConverterException</div>
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<div class="bottomNav"><a name="navbar.bottom">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.bottom.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../../picocli/package-summary.html">Package</a></li>
-<li><a href="../../picocli/CommandLine.MissingTypeConverterException.html" title="class in picocli">Class</a></li>
-<li class="navBarCell1Rev">Use</li>
-<li><a href="../package-tree.html">Tree</a></li>
-<li><a href="../../deprecated-list.html">Deprecated</a></li>
-<li><a href="../../index-all.html">Index</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li>Prev</li>
-<li>Next</li>
-</ul>
-<ul class="navList">
-<li><a href="../../index.html?picocli/class-use/CommandLine.MissingTypeConverterException.html" target="_top">Frames</a></li>
-<li><a href="CommandLine.MissingTypeConverterException.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_bottom">
-<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_bottom");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<a name="skip.navbar.bottom">
-<!--   -->
-</a></div>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-<p class="legalCopy"><small>Copyright &#169; 2017. All rights reserved.</small></p>
-</body>
-</html>
diff --git a/docs/apidocs/picocli/class-use/CommandLine.Option.html b/docs/apidocs/picocli/class-use/CommandLine.Option.html
deleted file mode 100644
index d14ead564..000000000
--- a/docs/apidocs/picocli/class-use/CommandLine.Option.html
+++ /dev/null
@@ -1,152 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- NewPage -->
-<html lang="en">
-<head>
-<!-- Generated by javadoc (1.8.0_51) on Wed Apr 19 00:59:45 JST 2017 -->
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Uses of Class picocli.CommandLine.Option (picocli 0.9.1 API)</title>
-<meta name="date" content="2017-04-19">
-<link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
-<script type="text/javascript" src="../../script.js"></script>
-</head>
-<body>
-<script type="text/javascript"><!--
-    try {
-        if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Uses of Class picocli.CommandLine.Option (picocli 0.9.1 API)";
-        }
-    }
-    catch(err) {
-    }
-//-->
-</script>
-<noscript>
-<div>JavaScript is disabled on your browser.</div>
-</noscript>
-<!-- ========= START OF TOP NAVBAR ======= -->
-<div class="topNav"><a name="navbar.top">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.top.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../../picocli/package-summary.html">Package</a></li>
-<li><a href="../../picocli/CommandLine.Option.html" title="annotation in picocli">Class</a></li>
-<li class="navBarCell1Rev">Use</li>
-<li><a href="../package-tree.html">Tree</a></li>
-<li><a href="../../deprecated-list.html">Deprecated</a></li>
-<li><a href="../../index-all.html">Index</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li>Prev</li>
-<li>Next</li>
-</ul>
-<ul class="navList">
-<li><a href="../../index.html?picocli/class-use/CommandLine.Option.html" target="_top">Frames</a></li>
-<li><a href="CommandLine.Option.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_top">
-<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_top");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<a name="skip.navbar.top">
-<!--   -->
-</a></div>
-<!-- ========= END OF TOP NAVBAR ========= -->
-<div class="header">
-<h2 title="Uses of Class picocli.CommandLine.Option" class="title">Uses of Class<br>picocli.CommandLine.Option</h2>
-</div>
-<div class="classUseContainer">
-<ul class="blockList">
-<li class="blockList">
-<ul class="blockList">
-<li class="blockList"><a name="picocli">
-<!--   -->
-</a>
-<h3>Uses of <a href="../../picocli/CommandLine.Option.html" title="annotation in picocli">CommandLine.Option</a> in <a href="../../picocli/package-summary.html">picocli</a></h3>
-<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing methods, and an explanation">
-<caption><span>Methods in <a href="../../picocli/package-summary.html">picocli</a> with parameters of type <a href="../../picocli/CommandLine.Option.html" title="annotation in picocli">CommandLine.Option</a></span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colFirst" scope="col">Modifier and Type</th>
-<th class="colLast" scope="col">Method and Description</th>
-</tr>
-<tbody>
-<tr class="altColor">
-<td class="colFirst"><code><a href="../../picocli/CommandLine.Help.Ansi.Text.html" title="class in picocli">CommandLine.Help.Ansi.Text</a>[][]</code></td>
-<td class="colLast"><span class="typeNameLabel">CommandLine.Help.IOptionRenderer.</span><code><span class="memberNameLink"><a href="../../picocli/CommandLine.Help.IOptionRenderer.html#render-picocli.CommandLine.Option-java.lang.reflect.Field-picocli.CommandLine.Help.IParamLabelRenderer-picocli.CommandLine.Help.ColorScheme-">render</a></span>(<a href="../../picocli/CommandLine.Option.html" title="annotation in picocli">CommandLine.Option</a>&nbsp;option,
-      <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/reflect/Field.html?is-external=true" title="class or interface in java.lang.reflect">Field</a>&nbsp;field,
-      <a href="../../picocli/CommandLine.Help.IParamLabelRenderer.html" title="interface in picocli">CommandLine.Help.IParamLabelRenderer</a>&nbsp;parameterLabelRenderer,
-      <a href="../../picocli/CommandLine.Help.ColorScheme.html" title="class in picocli">CommandLine.Help.ColorScheme</a>&nbsp;scheme)</code>
-<div class="block">Returns a text representation of the specified Option and the Field that captures the option value.</div>
-</td>
-</tr>
-</tbody>
-</table>
-</li>
-</ul>
-</li>
-</ul>
-</div>
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<div class="bottomNav"><a name="navbar.bottom">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.bottom.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../../picocli/package-summary.html">Package</a></li>
-<li><a href="../../picocli/CommandLine.Option.html" title="annotation in picocli">Class</a></li>
-<li class="navBarCell1Rev">Use</li>
-<li><a href="../package-tree.html">Tree</a></li>
-<li><a href="../../deprecated-list.html">Deprecated</a></li>
-<li><a href="../../index-all.html">Index</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li>Prev</li>
-<li>Next</li>
-</ul>
-<ul class="navList">
-<li><a href="../../index.html?picocli/class-use/CommandLine.Option.html" target="_top">Frames</a></li>
-<li><a href="CommandLine.Option.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_bottom">
-<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_bottom");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<a name="skip.navbar.bottom">
-<!--   -->
-</a></div>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-<p class="legalCopy"><small>Copyright &#169; 2017. All rights reserved.</small></p>
-</body>
-</html>
diff --git a/docs/apidocs/picocli/class-use/CommandLine.ParameterException.html b/docs/apidocs/picocli/class-use/CommandLine.ParameterException.html
deleted file mode 100644
index 1dacb4fc0..000000000
--- a/docs/apidocs/picocli/class-use/CommandLine.ParameterException.html
+++ /dev/null
@@ -1,162 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- NewPage -->
-<html lang="en">
-<head>
-<!-- Generated by javadoc (1.8.0_51) on Wed Apr 19 00:59:45 JST 2017 -->
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Uses of Class picocli.CommandLine.ParameterException (picocli 0.9.1 API)</title>
-<meta name="date" content="2017-04-19">
-<link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
-<script type="text/javascript" src="../../script.js"></script>
-</head>
-<body>
-<script type="text/javascript"><!--
-    try {
-        if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Uses of Class picocli.CommandLine.ParameterException (picocli 0.9.1 API)";
-        }
-    }
-    catch(err) {
-    }
-//-->
-</script>
-<noscript>
-<div>JavaScript is disabled on your browser.</div>
-</noscript>
-<!-- ========= START OF TOP NAVBAR ======= -->
-<div class="topNav"><a name="navbar.top">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.top.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../../picocli/package-summary.html">Package</a></li>
-<li><a href="../../picocli/CommandLine.ParameterException.html" title="class in picocli">Class</a></li>
-<li class="navBarCell1Rev">Use</li>
-<li><a href="../package-tree.html">Tree</a></li>
-<li><a href="../../deprecated-list.html">Deprecated</a></li>
-<li><a href="../../index-all.html">Index</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li>Prev</li>
-<li>Next</li>
-</ul>
-<ul class="navList">
-<li><a href="../../index.html?picocli/class-use/CommandLine.ParameterException.html" target="_top">Frames</a></li>
-<li><a href="CommandLine.ParameterException.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_top">
-<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_top");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<a name="skip.navbar.top">
-<!--   -->
-</a></div>
-<!-- ========= END OF TOP NAVBAR ========= -->
-<div class="header">
-<h2 title="Uses of Class picocli.CommandLine.ParameterException" class="title">Uses of Class<br>picocli.CommandLine.ParameterException</h2>
-</div>
-<div class="classUseContainer">
-<ul class="blockList">
-<li class="blockList">
-<ul class="blockList">
-<li class="blockList"><a name="picocli">
-<!--   -->
-</a>
-<h3>Uses of <a href="../../picocli/CommandLine.ParameterException.html" title="class in picocli">CommandLine.ParameterException</a> in <a href="../../picocli/package-summary.html">picocli</a></h3>
-<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing subclasses, and an explanation">
-<caption><span>Subclasses of <a href="../../picocli/CommandLine.ParameterException.html" title="class in picocli">CommandLine.ParameterException</a> in <a href="../../picocli/package-summary.html">picocli</a></span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colFirst" scope="col">Modifier and Type</th>
-<th class="colLast" scope="col">Class and Description</th>
-</tr>
-<tbody>
-<tr class="altColor">
-<td class="colFirst"><code>static class&nbsp;</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../picocli/CommandLine.DuplicateOptionAnnotationsException.html" title="class in picocli">CommandLine.DuplicateOptionAnnotationsException</a></span></code>
-<div class="block">Exception indicating that multiple fields have been annotated with the same Option name.</div>
-</td>
-</tr>
-<tr class="rowColor">
-<td class="colFirst"><code>static class&nbsp;</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../picocli/CommandLine.MissingParameterException.html" title="class in picocli">CommandLine.MissingParameterException</a></span></code>
-<div class="block">Exception indicating that a required parameter was not specified.</div>
-</td>
-</tr>
-<tr class="altColor">
-<td class="colFirst"><code>static class&nbsp;</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../picocli/CommandLine.MissingTypeConverterException.html" title="class in picocli">CommandLine.MissingTypeConverterException</a></span></code>
-<div class="block">Exception indicating that an annotated field had a type for which no <a href="../../picocli/CommandLine.ITypeConverter.html" title="interface in picocli"><code>CommandLine.ITypeConverter</code></a> was
- <a href="../../picocli/CommandLine.html#registerConverter-java.lang.Class-picocli.CommandLine.ITypeConverter-">registered</a>.</div>
-</td>
-</tr>
-</tbody>
-</table>
-</li>
-</ul>
-</li>
-</ul>
-</div>
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<div class="bottomNav"><a name="navbar.bottom">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.bottom.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../../picocli/package-summary.html">Package</a></li>
-<li><a href="../../picocli/CommandLine.ParameterException.html" title="class in picocli">Class</a></li>
-<li class="navBarCell1Rev">Use</li>
-<li><a href="../package-tree.html">Tree</a></li>
-<li><a href="../../deprecated-list.html">Deprecated</a></li>
-<li><a href="../../index-all.html">Index</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li>Prev</li>
-<li>Next</li>
-</ul>
-<ul class="navList">
-<li><a href="../../index.html?picocli/class-use/CommandLine.ParameterException.html" target="_top">Frames</a></li>
-<li><a href="CommandLine.ParameterException.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_bottom">
-<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_bottom");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<a name="skip.navbar.bottom">
-<!--   -->
-</a></div>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-<p class="legalCopy"><small>Copyright &#169; 2017. All rights reserved.</small></p>
-</body>
-</html>
diff --git a/docs/apidocs/picocli/class-use/CommandLine.Parameters.html b/docs/apidocs/picocli/class-use/CommandLine.Parameters.html
deleted file mode 100644
index bc004c2d4..000000000
--- a/docs/apidocs/picocli/class-use/CommandLine.Parameters.html
+++ /dev/null
@@ -1,152 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- NewPage -->
-<html lang="en">
-<head>
-<!-- Generated by javadoc (1.8.0_51) on Wed Apr 19 00:59:45 JST 2017 -->
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Uses of Class picocli.CommandLine.Parameters (picocli 0.9.1 API)</title>
-<meta name="date" content="2017-04-19">
-<link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
-<script type="text/javascript" src="../../script.js"></script>
-</head>
-<body>
-<script type="text/javascript"><!--
-    try {
-        if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Uses of Class picocli.CommandLine.Parameters (picocli 0.9.1 API)";
-        }
-    }
-    catch(err) {
-    }
-//-->
-</script>
-<noscript>
-<div>JavaScript is disabled on your browser.</div>
-</noscript>
-<!-- ========= START OF TOP NAVBAR ======= -->
-<div class="topNav"><a name="navbar.top">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.top.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../../picocli/package-summary.html">Package</a></li>
-<li><a href="../../picocli/CommandLine.Parameters.html" title="annotation in picocli">Class</a></li>
-<li class="navBarCell1Rev">Use</li>
-<li><a href="../package-tree.html">Tree</a></li>
-<li><a href="../../deprecated-list.html">Deprecated</a></li>
-<li><a href="../../index-all.html">Index</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li>Prev</li>
-<li>Next</li>
-</ul>
-<ul class="navList">
-<li><a href="../../index.html?picocli/class-use/CommandLine.Parameters.html" target="_top">Frames</a></li>
-<li><a href="CommandLine.Parameters.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_top">
-<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_top");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<a name="skip.navbar.top">
-<!--   -->
-</a></div>
-<!-- ========= END OF TOP NAVBAR ========= -->
-<div class="header">
-<h2 title="Uses of Class picocli.CommandLine.Parameters" class="title">Uses of Class<br>picocli.CommandLine.Parameters</h2>
-</div>
-<div class="classUseContainer">
-<ul class="blockList">
-<li class="blockList">
-<ul class="blockList">
-<li class="blockList"><a name="picocli">
-<!--   -->
-</a>
-<h3>Uses of <a href="../../picocli/CommandLine.Parameters.html" title="annotation in picocli">CommandLine.Parameters</a> in <a href="../../picocli/package-summary.html">picocli</a></h3>
-<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing methods, and an explanation">
-<caption><span>Methods in <a href="../../picocli/package-summary.html">picocli</a> with parameters of type <a href="../../picocli/CommandLine.Parameters.html" title="annotation in picocli">CommandLine.Parameters</a></span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colFirst" scope="col">Modifier and Type</th>
-<th class="colLast" scope="col">Method and Description</th>
-</tr>
-<tbody>
-<tr class="altColor">
-<td class="colFirst"><code><a href="../../picocli/CommandLine.Help.Ansi.Text.html" title="class in picocli">CommandLine.Help.Ansi.Text</a>[][]</code></td>
-<td class="colLast"><span class="typeNameLabel">CommandLine.Help.IParameterRenderer.</span><code><span class="memberNameLink"><a href="../../picocli/CommandLine.Help.IParameterRenderer.html#render-picocli.CommandLine.Parameters-java.lang.reflect.Field-picocli.CommandLine.Help.IParamLabelRenderer-picocli.CommandLine.Help.ColorScheme-">render</a></span>(<a href="../../picocli/CommandLine.Parameters.html" title="annotation in picocli">CommandLine.Parameters</a>&nbsp;parameters,
-      <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/reflect/Field.html?is-external=true" title="class or interface in java.lang.reflect">Field</a>&nbsp;field,
-      <a href="../../picocli/CommandLine.Help.IParamLabelRenderer.html" title="interface in picocli">CommandLine.Help.IParamLabelRenderer</a>&nbsp;parameterLabelRenderer,
-      <a href="../../picocli/CommandLine.Help.ColorScheme.html" title="class in picocli">CommandLine.Help.ColorScheme</a>&nbsp;scheme)</code>
-<div class="block">Returns a text representation of the specified Parameters and the Field that captures the parameter values.</div>
-</td>
-</tr>
-</tbody>
-</table>
-</li>
-</ul>
-</li>
-</ul>
-</div>
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<div class="bottomNav"><a name="navbar.bottom">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.bottom.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../../picocli/package-summary.html">Package</a></li>
-<li><a href="../../picocli/CommandLine.Parameters.html" title="annotation in picocli">Class</a></li>
-<li class="navBarCell1Rev">Use</li>
-<li><a href="../package-tree.html">Tree</a></li>
-<li><a href="../../deprecated-list.html">Deprecated</a></li>
-<li><a href="../../index-all.html">Index</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li>Prev</li>
-<li>Next</li>
-</ul>
-<ul class="navList">
-<li><a href="../../index.html?picocli/class-use/CommandLine.Parameters.html" target="_top">Frames</a></li>
-<li><a href="CommandLine.Parameters.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_bottom">
-<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_bottom");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<a name="skip.navbar.bottom">
-<!--   -->
-</a></div>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-<p class="legalCopy"><small>Copyright &#169; 2017. All rights reserved.</small></p>
-</body>
-</html>
diff --git a/docs/apidocs/picocli/class-use/CommandLine.html b/docs/apidocs/picocli/class-use/CommandLine.html
deleted file mode 100644
index ca27680a3..000000000
--- a/docs/apidocs/picocli/class-use/CommandLine.html
+++ /dev/null
@@ -1,157 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- NewPage -->
-<html lang="en">
-<head>
-<!-- Generated by javadoc (1.8.0_51) on Wed Apr 19 00:59:45 JST 2017 -->
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Uses of Class picocli.CommandLine (picocli 0.9.1 API)</title>
-<meta name="date" content="2017-04-19">
-<link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
-<script type="text/javascript" src="../../script.js"></script>
-</head>
-<body>
-<script type="text/javascript"><!--
-    try {
-        if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Uses of Class picocli.CommandLine (picocli 0.9.1 API)";
-        }
-    }
-    catch(err) {
-    }
-//-->
-</script>
-<noscript>
-<div>JavaScript is disabled on your browser.</div>
-</noscript>
-<!-- ========= START OF TOP NAVBAR ======= -->
-<div class="topNav"><a name="navbar.top">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.top.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../../picocli/package-summary.html">Package</a></li>
-<li><a href="../../picocli/CommandLine.html" title="class in picocli">Class</a></li>
-<li class="navBarCell1Rev">Use</li>
-<li><a href="../package-tree.html">Tree</a></li>
-<li><a href="../../deprecated-list.html">Deprecated</a></li>
-<li><a href="../../index-all.html">Index</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li>Prev</li>
-<li>Next</li>
-</ul>
-<ul class="navList">
-<li><a href="../../index.html?picocli/class-use/CommandLine.html" target="_top">Frames</a></li>
-<li><a href="CommandLine.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_top">
-<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_top");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<a name="skip.navbar.top">
-<!--   -->
-</a></div>
-<!-- ========= END OF TOP NAVBAR ========= -->
-<div class="header">
-<h2 title="Uses of Class picocli.CommandLine" class="title">Uses of Class<br>picocli.CommandLine</h2>
-</div>
-<div class="classUseContainer">
-<ul class="blockList">
-<li class="blockList">
-<ul class="blockList">
-<li class="blockList"><a name="picocli">
-<!--   -->
-</a>
-<h3>Uses of <a href="../../picocli/CommandLine.html" title="class in picocli">CommandLine</a> in <a href="../../picocli/package-summary.html">picocli</a></h3>
-<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing methods, and an explanation">
-<caption><span>Methods in <a href="../../picocli/package-summary.html">picocli</a> that return <a href="../../picocli/CommandLine.html" title="class in picocli">CommandLine</a></span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colFirst" scope="col">Modifier and Type</th>
-<th class="colLast" scope="col">Method and Description</th>
-</tr>
-<tbody>
-<tr class="altColor">
-<td class="colFirst"><code><a href="../../picocli/CommandLine.html" title="class in picocli">CommandLine</a></code></td>
-<td class="colLast"><span class="typeNameLabel">CommandLine.</span><code><span class="memberNameLink"><a href="../../picocli/CommandLine.html#addCommand-java.lang.String-java.lang.Object-">addCommand</a></span>(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;name,
-          <a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&nbsp;annotatedObject)</code>
-<div class="block">Registers a sub-command with the specified name.</div>
-</td>
-</tr>
-<tr class="rowColor">
-<td class="colFirst"><code>&lt;K&gt;&nbsp;<a href="../../picocli/CommandLine.html" title="class in picocli">CommandLine</a></code></td>
-<td class="colLast"><span class="typeNameLabel">CommandLine.</span><code><span class="memberNameLink"><a href="../../picocli/CommandLine.html#registerConverter-java.lang.Class-picocli.CommandLine.ITypeConverter-">registerConverter</a></span>(<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a>&lt;K&gt;&nbsp;cls,
-                 <a href="../../picocli/CommandLine.ITypeConverter.html" title="interface in picocli">CommandLine.ITypeConverter</a>&lt;K&gt;&nbsp;converter)</code>
-<div class="block">Registers the specified type converter for the specified class.</div>
-</td>
-</tr>
-</tbody>
-</table>
-</li>
-</ul>
-</li>
-</ul>
-</div>
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<div class="bottomNav"><a name="navbar.bottom">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.bottom.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../../picocli/package-summary.html">Package</a></li>
-<li><a href="../../picocli/CommandLine.html" title="class in picocli">Class</a></li>
-<li class="navBarCell1Rev">Use</li>
-<li><a href="../package-tree.html">Tree</a></li>
-<li><a href="../../deprecated-list.html">Deprecated</a></li>
-<li><a href="../../index-all.html">Index</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li>Prev</li>
-<li>Next</li>
-</ul>
-<ul class="navList">
-<li><a href="../../index.html?picocli/class-use/CommandLine.html" target="_top">Frames</a></li>
-<li><a href="CommandLine.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_bottom">
-<li><a href="../../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_bottom");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<a name="skip.navbar.bottom">
-<!--   -->
-</a></div>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-<p class="legalCopy"><small>Copyright &#169; 2017. All rights reserved.</small></p>
-</body>
-</html>
diff --git a/docs/apidocs/picocli/package-frame.html b/docs/apidocs/picocli/package-frame.html
index a83656073..0e6800d6d 100644
--- a/docs/apidocs/picocli/package-frame.html
+++ b/docs/apidocs/picocli/package-frame.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_131) on Sun Apr 23 15:37:34 JST 2017 -->
-<title>picocli (picocli 0.9.3 API)</title>
-<meta name="date" content="2017-04-23">
+<!-- Generated by javadoc (1.8.0_131) on Thu May 04 10:49:39 JST 2017 -->
+<title>picocli (picocli 0.9.4 API)</title>
+<meta name="date" content="2017-05-04">
 <link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
 <script type="text/javascript" src="../script.js"></script>
 </head>
diff --git a/docs/apidocs/picocli/package-summary.html b/docs/apidocs/picocli/package-summary.html
index e403f9586..9fd50dd9a 100644
--- a/docs/apidocs/picocli/package-summary.html
+++ b/docs/apidocs/picocli/package-summary.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_131) on Sun Apr 23 15:37:34 JST 2017 -->
-<title>picocli (picocli 0.9.3 API)</title>
-<meta name="date" content="2017-04-23">
+<!-- Generated by javadoc (1.8.0_131) on Thu May 04 10:49:39 JST 2017 -->
+<title>picocli (picocli 0.9.4 API)</title>
+<meta name="date" content="2017-05-04">
 <link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
 <script type="text/javascript" src="../script.js"></script>
 </head>
@@ -12,7 +12,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="picocli (picocli 0.9.3 API)";
+            parent.document.title="picocli (picocli 0.9.4 API)";
         }
     }
     catch(err) {
diff --git a/docs/apidocs/picocli/package-tree.html b/docs/apidocs/picocli/package-tree.html
index 0a7a2b494..2cb27310d 100644
--- a/docs/apidocs/picocli/package-tree.html
+++ b/docs/apidocs/picocli/package-tree.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_131) on Sun Apr 23 15:37:34 JST 2017 -->
-<title>picocli Class Hierarchy (picocli 0.9.3 API)</title>
-<meta name="date" content="2017-04-23">
+<!-- Generated by javadoc (1.8.0_131) on Thu May 04 10:49:39 JST 2017 -->
+<title>picocli Class Hierarchy (picocli 0.9.4 API)</title>
+<meta name="date" content="2017-05-04">
 <link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
 <script type="text/javascript" src="../script.js"></script>
 </head>
@@ -12,7 +12,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="picocli Class Hierarchy (picocli 0.9.3 API)";
+            parent.document.title="picocli Class Hierarchy (picocli 0.9.4 API)";
         }
     }
     catch(err) {
diff --git a/docs/apidocs/picocli/package-use.html b/docs/apidocs/picocli/package-use.html
deleted file mode 100644
index 925e907f1..000000000
--- a/docs/apidocs/picocli/package-use.html
+++ /dev/null
@@ -1,248 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!-- NewPage -->
-<html lang="en">
-<head>
-<!-- Generated by javadoc (1.8.0_51) on Wed Apr 19 00:59:45 JST 2017 -->
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Uses of Package picocli (picocli 0.9.1 API)</title>
-<meta name="date" content="2017-04-19">
-<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
-<script type="text/javascript" src="../script.js"></script>
-</head>
-<body>
-<script type="text/javascript"><!--
-    try {
-        if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Uses of Package picocli (picocli 0.9.1 API)";
-        }
-    }
-    catch(err) {
-    }
-//-->
-</script>
-<noscript>
-<div>JavaScript is disabled on your browser.</div>
-</noscript>
-<!-- ========= START OF TOP NAVBAR ======= -->
-<div class="topNav"><a name="navbar.top">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.top.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../picocli/package-summary.html">Package</a></li>
-<li>Class</li>
-<li class="navBarCell1Rev">Use</li>
-<li><a href="package-tree.html">Tree</a></li>
-<li><a href="../deprecated-list.html">Deprecated</a></li>
-<li><a href="../index-all.html">Index</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li>Prev</li>
-<li>Next</li>
-</ul>
-<ul class="navList">
-<li><a href="../index.html?picocli/package-use.html" target="_top">Frames</a></li>
-<li><a href="package-use.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_top">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_top");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<a name="skip.navbar.top">
-<!--   -->
-</a></div>
-<!-- ========= END OF TOP NAVBAR ========= -->
-<div class="header">
-<h1 title="Uses of Package picocli" class="title">Uses of Package<br>picocli</h1>
-</div>
-<div class="contentContainer">
-<ul class="blockList">
-<li class="blockList"><a name="picocli">
-<!--   -->
-</a>
-<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing classes, and an explanation">
-<caption><span>Classes in <a href="../picocli/package-summary.html">picocli</a> used by <a href="../picocli/package-summary.html">picocli</a></span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colOne" scope="col">Class and Description</th>
-</tr>
-<tbody>
-<tr class="altColor">
-<td class="colOne"><a href="../picocli/class-use/CommandLine.html#picocli">CommandLine</a>
-<div class="block">
- CommandLine interpreter that uses reflection to initialize an annotated domain object with values obtained from the
- command line arguments.</div>
-</td>
-</tr>
-<tr class="rowColor">
-<td class="colOne"><a href="../picocli/class-use/CommandLine.Arity.html#picocli">CommandLine.Arity</a>
-<div class="block">Describes the number of parameters required and accepted by an option or a positional parameter.</div>
-</td>
-</tr>
-<tr class="altColor">
-<td class="colOne"><a href="../picocli/class-use/CommandLine.Help.html#picocli">CommandLine.Help</a>
-<div class="block">A collection of methods and inner classes that provide fine-grained control over the contents and layout of
- the usage help message to display to end users when help is requested or invalid input values were specified.</div>
-</td>
-</tr>
-<tr class="rowColor">
-<td class="colOne"><a href="../picocli/class-use/CommandLine.Help.Ansi.IStyle.html#picocli">CommandLine.Help.Ansi.IStyle</a>
-<div class="block">Defines the interface for an ANSI escape sequence.</div>
-</td>
-</tr>
-<tr class="altColor">
-<td class="colOne"><a href="../picocli/class-use/CommandLine.Help.Ansi.Style.html#picocli">CommandLine.Help.Ansi.Style</a>
-<div class="block">A set of pre-defined ANSI escape code styles and colors, and a set of convenience methods for parsing
- text with embedded markup style names, as well as convenience methods for converting
- styles to strings with embedded escape codes.</div>
-</td>
-</tr>
-<tr class="rowColor">
-<td class="colOne"><a href="../picocli/class-use/CommandLine.Help.Ansi.Text.html#picocli">CommandLine.Help.Ansi.Text</a>
-<div class="block">Encapsulates rich text with styles and colors in a way that other components like <a href="../picocli/CommandLine.Help.TextTable.html" title="class in picocli"><code>CommandLine.Help.TextTable</code></a>
- are unaware of the embedded ANSI escape codes.</div>
-</td>
-</tr>
-<tr class="altColor">
-<td class="colOne"><a href="../picocli/class-use/CommandLine.Help.ColorScheme.html#picocli">CommandLine.Help.ColorScheme</a>
-<div class="block">All usage help message are generated with a color scheme that assigns certain styles and colors to common
- parts of a usage message: the command name, options, positional parameters and option parameters.</div>
-</td>
-</tr>
-<tr class="rowColor">
-<td class="colOne"><a href="../picocli/class-use/CommandLine.Help.Column.html#picocli">CommandLine.Help.Column</a>
-<div class="block">Columns define the width, indent (leading number of spaces in a column before the value) and
- <a href="../picocli/CommandLine.Help.Column.Overflow.html" title="enum in picocli">Overflow</a> policy of a column in a <a href="../picocli/CommandLine.Help.TextTable.html" title="class in picocli">TextTable</a>.</div>
-</td>
-</tr>
-<tr class="altColor">
-<td class="colOne"><a href="../picocli/class-use/CommandLine.Help.Column.Overflow.html#picocli">CommandLine.Help.Column.Overflow</a>
-<div class="block">Policy for handling text that is longer than the column width:
-  span multiple columns, wrap to the next row, or simply truncate the portion that doesn't fit.</div>
-</td>
-</tr>
-<tr class="rowColor">
-<td class="colOne"><a href="../picocli/class-use/CommandLine.Help.IOptionRenderer.html#picocli">CommandLine.Help.IOptionRenderer</a>
-<div class="block">When customizing online help for <a href="../picocli/CommandLine.Option.html" title="annotation in picocli"><code>Option</code></a> details, a custom <code>IOptionRenderer</code> can be
- used to create textual representation of an Option in a tabular format: one or more rows, each containing
- one or more columns.</div>
-</td>
-</tr>
-<tr class="altColor">
-<td class="colOne"><a href="../picocli/class-use/CommandLine.Help.IParameterRenderer.html#picocli">CommandLine.Help.IParameterRenderer</a>
-<div class="block">When customizing online help for <a href="../picocli/CommandLine.Parameters.html" title="annotation in picocli"><code>Parameters</code></a> details, a custom <code>IParameterRenderer</code>
- can be used to create textual representation of a Parameters field in a tabular format: one or more rows,
- each containing one or more columns.</div>
-</td>
-</tr>
-<tr class="rowColor">
-<td class="colOne"><a href="../picocli/class-use/CommandLine.Help.IParamLabelRenderer.html#picocli">CommandLine.Help.IParamLabelRenderer</a>
-<div class="block">When customizing online usage help for an option parameter or a positional parameter, a custom
- <code>IParamLabelRenderer</code> can be used to render the parameter name or label to a String.</div>
-</td>
-</tr>
-<tr class="altColor">
-<td class="colOne"><a href="../picocli/class-use/CommandLine.Help.Layout.html#picocli">CommandLine.Help.Layout</a>
-<div class="block">Use a Layout to format usage help text for options and parameters in tabular format.</div>
-</td>
-</tr>
-<tr class="rowColor">
-<td class="colOne"><a href="../picocli/class-use/CommandLine.Help.TextTable.html#picocli">CommandLine.Help.TextTable</a>
-<div class="block">Responsible for spacing out <a href="../picocli/CommandLine.Help.Ansi.Text.html" title="class in picocli"><code>CommandLine.Help.Ansi.Text</code></a> values according to the <a href="../picocli/CommandLine.Help.Column.html" title="class in picocli"><code>CommandLine.Help.Column</code></a> definitions the table was
- created with.</div>
-</td>
-</tr>
-<tr class="altColor">
-<td class="colOne"><a href="../picocli/class-use/CommandLine.ITypeConverter.html#picocli">CommandLine.ITypeConverter</a>
-<div class="block">
- When parsing command line arguments and initializing
- fields annotated with <a href="../picocli/CommandLine.Option.html" title="annotation in picocli"><code>@Option</code></a> or <a href="../picocli/CommandLine.Parameters.html" title="annotation in picocli"><code>@Parameters</code></a>,
- String values can be converted to any type for which a <code>ITypeConverter</code> is registered.</div>
-</td>
-</tr>
-<tr class="rowColor">
-<td class="colOne"><a href="../picocli/class-use/CommandLine.Option.html#picocli">CommandLine.Option</a>
-<div class="block">
- Annotate fields in your class with <code>@Option</code> and picocli will initialize these fields when matching
- arguments are specified on the command line.</div>
-</td>
-</tr>
-<tr class="altColor">
-<td class="colOne"><a href="../picocli/class-use/CommandLine.ParameterException.html#picocli">CommandLine.ParameterException</a>
-<div class="block">Exception indicating something went wrong while parsing command line options.</div>
-</td>
-</tr>
-<tr class="rowColor">
-<td class="colOne"><a href="../picocli/class-use/CommandLine.Parameters.html#picocli">CommandLine.Parameters</a>
-<div class="block">
- Fields annotated with <code>@Parameters</code> will be initialized with positional parameters.</div>
-</td>
-</tr>
-</tbody>
-</table>
-</li>
-</ul>
-</div>
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<div class="bottomNav"><a name="navbar.bottom">
-<!--   -->
-</a>
-<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
-<a name="navbar.bottom.firstrow">
-<!--   -->
-</a>
-<ul class="navList" title="Navigation">
-<li><a href="../picocli/package-summary.html">Package</a></li>
-<li>Class</li>
-<li class="navBarCell1Rev">Use</li>
-<li><a href="package-tree.html">Tree</a></li>
-<li><a href="../deprecated-list.html">Deprecated</a></li>
-<li><a href="../index-all.html">Index</a></li>
-</ul>
-</div>
-<div class="subNav">
-<ul class="navList">
-<li>Prev</li>
-<li>Next</li>
-</ul>
-<ul class="navList">
-<li><a href="../index.html?picocli/package-use.html" target="_top">Frames</a></li>
-<li><a href="package-use.html" target="_top">No&nbsp;Frames</a></li>
-</ul>
-<ul class="navList" id="allclasses_navbar_bottom">
-<li><a href="../allclasses-noframe.html">All&nbsp;Classes</a></li>
-</ul>
-<div>
-<script type="text/javascript"><!--
-  allClassesLink = document.getElementById("allclasses_navbar_bottom");
-  if(window==top) {
-    allClassesLink.style.display = "block";
-  }
-  else {
-    allClassesLink.style.display = "none";
-  }
-  //-->
-</script>
-</div>
-<a name="skip.navbar.bottom">
-<!--   -->
-</a></div>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-<p class="legalCopy"><small>Copyright &#169; 2017. All rights reserved.</small></p>
-</body>
-</html>
diff --git a/docs/apidocs/serialized-form.html b/docs/apidocs/serialized-form.html
index 68f7f77ca..36a319808 100644
--- a/docs/apidocs/serialized-form.html
+++ b/docs/apidocs/serialized-form.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (1.8.0_131) on Sun Apr 23 15:37:34 JST 2017 -->
-<title>Serialized Form (picocli 0.9.3 API)</title>
-<meta name="date" content="2017-04-23">
+<!-- Generated by javadoc (1.8.0_131) on Thu May 04 10:49:39 JST 2017 -->
+<title>Serialized Form (picocli 0.9.4 API)</title>
+<meta name="date" content="2017-05-04">
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
 <script type="text/javascript" src="script.js"></script>
 </head>
@@ -12,7 +12,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Serialized Form (picocli 0.9.3 API)";
+            parent.document.title="Serialized Form (picocli 0.9.4 API)";
         }
     }
     catch(err) {
diff --git a/docs/index.adoc b/docs/index.adoc
index caa3926ec..9006d2896 100644
--- a/docs/index.adoc
+++ b/docs/index.adoc
@@ -1,8 +1,8 @@
 = picocli - a mighty tiny Command Line Interface
 :author: Remko Popma
 :email: rpopma@apache.org
-:revnumber: 0.9.4-SNAPSHOT
-:revdate: 2017-04-30
+:revnumber: 0.9.4
+:revdate: 2017-05-04
 :toc: left
 :numbered:
 :toclevels: 2
diff --git a/docs/index.html b/docs/index.html
index ee89775f8..8470fe742 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -516,8 +516,8 @@ <h1>picocli - a mighty tiny Command Line Interface</h1>
 <div class="details">
 <span id="author" class="author">Remko Popma</span><br>
 <span id="email" class="email"><a href="mailto:rpopma@apache.org">rpopma@apache.org</a></span><br>
-<span id="revnumber">version 0.9.4-SNAPSHOT,</span>
-<span id="revdate">2017-04-30</span>
+<span id="revnumber">version 0.9.4,</span>
+<span id="revdate">2017-05-04</span>
 </div>
 <div id="toc" class="toc2">
 <div id="toctitle">Features</div>
@@ -539,7 +539,7 @@ <h1>picocli - a mighty tiny Command Line Interface</h1>
 </li>
 <li><a href="#_multiple_values">4. Multiple Values</a>
 <ul class="sectlevel2">
-<li><a href="#_default">4.1. Default</a></li>
+<li><a href="#_default_arity">4.1. Default Arity</a></li>
 <li><a href="#_arity">4.2. Arity</a></li>
 <li><a href="#_split_regex">4.3. Split Regex</a></li>
 <li><a href="#_multiple_occurrences">4.4. Multiple Occurrences</a></li>
@@ -547,8 +547,8 @@ <h1>picocli - a mighty tiny Command Line Interface</h1>
 </li>
 <li><a href="#_required_arguments">5. Required Arguments</a>
 <ul class="sectlevel2">
-<li><a href="#_options_2">5.1. Options</a></li>
-<li><a href="#_parameters">5.2. Parameters</a></li>
+<li><a href="#_required_options">5.1. Required Options</a></li>
+<li><a href="#_required_parameters">5.2. Required Parameters</a></li>
 </ul>
 </li>
 <li><a href="#_help_options">6. Help Options</a></li>
@@ -573,9 +573,10 @@ <h1>picocli - a mighty tiny Command Line Interface</h1>
 <ul class="sectlevel2">
 <li><a href="#_colorized_example">8.1. Colorized Example</a></li>
 <li><a href="#_usage_help_with_styles_and_colors">8.2. Usage Help with Styles and Colors</a></li>
-<li><a href="#_configuring_fixed_elements">8.3. Configuring Fixed Elements</a></li>
-<li><a href="#_supported_platforms">8.4. Supported Platforms</a></li>
-<li><a href="#_forcing_ansi_on_off">8.5. Forcing ANSI On/Off</a></li>
+<li><a href="#_more_colors">8.3. More Colors</a></li>
+<li><a href="#_configuring_fixed_elements">8.4. Configuring Fixed Elements</a></li>
+<li><a href="#_supported_platforms">8.5. Supported Platforms</a></li>
+<li><a href="#_forcing_ansi_on_off">8.6. Forcing ANSI On/Off</a></li>
 </ul>
 </li>
 <li><a href="#_usage_help_api">9. Usage Help API</a>
@@ -591,22 +592,22 @@ <h1>picocli - a mighty tiny Command Line Interface</h1>
 <li><a href="#_usage_help_for_subcommands">10.3. Usage Help for Subcommands</a></li>
 </ul>
 </li>
-<li><a href="#_less_boilerplate">11. Less Boilerplate</a></li>
-<li><a href="#_tips_tricks">12. Tips &amp; Tricks</a>
+<li><a href="#_tips_tricks">11. Tips &amp; Tricks</a>
 <ul class="sectlevel2">
-<li><a href="#_boolean_parameters">12.1. Boolean Parameters</a></li>
-<li><a href="#_hexadecimal_values">12.2. Hexadecimal Values</a></li>
-<li><a href="#_option_parameter_separators_2">12.3. Option-Parameter Separators</a></li>
-<li><a href="#_subclassing_for_reuse">12.4. Subclassing for Reuse</a></li>
-<li><a href="#_best_practices_for_command_line_interfaces">12.5. Best Practices for Command Line Interfaces</a></li>
+<li><a href="#_less_boilerplate">11.1. Less Boilerplate</a></li>
+<li><a href="#_boolean_parameters">11.2. Boolean Parameters</a></li>
+<li><a href="#_hexadecimal_values">11.3. Hexadecimal Values</a></li>
+<li><a href="#_option_parameter_separators_2">11.4. Option-Parameter Separators</a></li>
+<li><a href="#_subclassing_for_reuse">11.5. Subclassing for Reuse</a></li>
+<li><a href="#_best_practices_for_command_line_interfaces">11.6. Best Practices for Command Line Interfaces</a></li>
 </ul>
 </li>
-<li><a href="#_api_javadoc">13. API Javadoc</a></li>
-<li><a href="#_github_project">14. GitHub Project</a></li>
-<li><a href="#_issue_tracker">15. Issue Tracker</a></li>
-<li><a href="#_license">16. License</a></li>
-<li><a href="#_releases">17. Releases</a></li>
-<li><a href="#_download">18. Download</a></li>
+<li><a href="#_api_javadoc">12. API Javadoc</a></li>
+<li><a href="#_github_project">13. GitHub Project</a></li>
+<li><a href="#_issue_tracker">14. Issue Tracker</a></li>
+<li><a href="#_license">15. License</a></li>
+<li><a href="#_releases">16. Releases</a></li>
+<li><a href="#_download">17. Download</a></li>
 </ul>
 </div>
 </div>
@@ -649,10 +650,6 @@ <h2 id="_introduction">1. Introduction</h2>
     <span class="annotation">@Option</span>(names = { <span class="string"><span class="delimiter">&quot;</span><span class="content">-v</span><span class="delimiter">&quot;</span></span>, <span class="string"><span class="delimiter">&quot;</span><span class="content">--verbose</span><span class="delimiter">&quot;</span></span> }, description = <span class="string"><span class="delimiter">&quot;</span><span class="content">Be verbose.</span><span class="delimiter">&quot;</span></span>)
     <span class="directive">private</span> <span class="type">boolean</span> verbose = <span class="predefined-constant">false</span>;
 
-    <span class="annotation">@Option</span>(names = { <span class="string"><span class="delimiter">&quot;</span><span class="content">-h</span><span class="delimiter">&quot;</span></span>, <span class="string"><span class="delimiter">&quot;</span><span class="content">--help</span><span class="delimiter">&quot;</span></span> }, help = <span class="predefined-constant">true</span>,
-            description = <span class="string"><span class="delimiter">&quot;</span><span class="content">Displays this help message and quits.</span><span class="delimiter">&quot;</span></span>)
-    <span class="directive">private</span> <span class="type">boolean</span> helpRequested = <span class="predefined-constant">false</span>;
-
     <span class="annotation">@Parameters</span>(arity = <span class="string"><span class="delimiter">&quot;</span><span class="content">1..*</span><span class="delimiter">&quot;</span></span>, paramLabel = <span class="string"><span class="delimiter">&quot;</span><span class="content">FILE</span><span class="delimiter">&quot;</span></span>, description = <span class="string"><span class="delimiter">&quot;</span><span class="content">File(s) to process.</span><span class="delimiter">&quot;</span></span>)
     <span class="directive">private</span> <span class="predefined-type">File</span><span class="type">[]</span> inputFiles;
     ...
@@ -666,7 +663,6 @@ <h2 id="_introduction">1. Introduction</h2>
 <div class="content">
 <pre class="CodeRay highlight"><code data-lang="java"><span class="predefined-type">String</span><span class="type">[]</span> args = { <span class="string"><span class="delimiter">&quot;</span><span class="content">-v</span><span class="delimiter">&quot;</span></span>, <span class="string"><span class="delimiter">&quot;</span><span class="content">inputFile1</span><span class="delimiter">&quot;</span></span>, <span class="string"><span class="delimiter">&quot;</span><span class="content">inputFile2</span><span class="delimiter">&quot;</span></span> };
 Example app = CommandLine.parse(<span class="keyword">new</span> Example(), args);
-<span class="keyword">assert</span> !app.helpRequested;
 <span class="keyword">assert</span>  app.verbose;
 <span class="keyword">assert</span>  app.inputFiles != <span class="predefined-constant">null</span> &amp;&amp; app.inputFiles.length == <span class="integer">2</span>;</code></pre>
 </div>
@@ -677,8 +673,8 @@ <h2 id="_introduction">1. Introduction</h2>
 <h2 id="_options_and_parameters">2. Options and Parameters</h2>
 <div class="sectionbody">
 <div class="paragraph">
-<p>Command line arguments can be separated into <em>options</em> (sometimes called <em>flags</em> or <em>switches</em>), and <em>parameters</em> (sometimes called <em>positional parameters</em> or <em>operands</em>).
-Options have a name, parameters are the values that follow the options.</p>
+<p>Command line arguments can be separated into <em>options</em>  and <em>positional parameters</em>.
+Options have a name, positional parameters are the values that follow the options.</p>
 </div>
 <div class="paragraph">
 <p><span class="image"><img src="images/OptionsAndParameters2.png" alt="Example command with annotated @Option and @Parameters"></span></p>
@@ -689,7 +685,8 @@ <h2 id="_options_and_parameters">2. Options and Parameters</h2>
 <div class="sect2">
 <h3 id="_options">2.1. Options</h3>
 <div class="paragraph">
-<p>An option must have one or more <code>names</code>. Option names usually have a prefix to distinguish them from parameters. Different operating systems and applications use <a href="https://en.wikipedia.org/wiki/Command-line_interface#Command-line_option">different prefixing</a> styles. Picocli lets you use any option name you want.</p>
+<p>An option must have one or more <code>names</code>.
+Picocli lets you use any option name you want.</p>
 </div>
 <div class="admonitionblock tip">
 <table>
@@ -704,23 +701,22 @@ <h3 id="_options">2.1. Options</h3>
 </table>
 </div>
 <div class="paragraph">
-<p>The below example shows options with one or more names, options that take an option parameter, and "help" options.</p>
+<p>The below example shows options with one or more names, options that take an option parameter, and a <a href="#_help_options">help</a> option.</p>
 </div>
 <div class="listingblock">
 <div class="content">
 <pre class="CodeRay highlight"><code data-lang="java"><span class="type">class</span> <span class="class">Tar</span> {
-    <span class="annotation">@Option</span>(names = { <span class="string"><span class="delimiter">&quot;</span><span class="content">-c</span><span class="delimiter">&quot;</span></span>, <span class="string"><span class="delimiter">&quot;</span><span class="content">--create</span><span class="delimiter">&quot;</span></span> }, description = <span class="string"><span class="delimiter">&quot;</span><span class="content">create a new archive</span><span class="delimiter">&quot;</span></span>)
-    <span class="type">boolean</span> create;
-
-    <span class="annotation">@Option</span>(names = <span class="string"><span class="delimiter">&quot;</span><span class="content">-x</span><span class="delimiter">&quot;</span></span>, description = <span class="string"><span class="delimiter">&quot;</span><span class="content">extract files from an archive</span><span class="delimiter">&quot;</span></span>)
+    <span class="annotation">@Option</span>(names = <span class="string"><span class="delimiter">&quot;</span><span class="content">-c</span><span class="delimiter">&quot;</span></span>, description = <span class="string"><span class="delimiter">&quot;</span><span class="content">create a new archive</span><span class="delimiter">&quot;</span></span>)
     <span class="type">boolean</span> extract;
 
-    <span class="annotation">@Option</span>(names = { <span class="string"><span class="delimiter">&quot;</span><span class="content">-f</span><span class="delimiter">&quot;</span></span>, <span class="string"><span class="delimiter">&quot;</span><span class="content">--file</span><span class="delimiter">&quot;</span></span> }, paramLabel = <span class="string"><span class="delimiter">&quot;</span><span class="content">ARCHIVE</span><span class="delimiter">&quot;</span></span>,
-            description = <span class="string"><span class="delimiter">&quot;</span><span class="content">use archive file or device ARCHIVE</span><span class="delimiter">&quot;</span></span>)
+    <span class="annotation">@Option</span>(names = { <span class="string"><span class="delimiter">&quot;</span><span class="content">-f</span><span class="delimiter">&quot;</span></span>, <span class="string"><span class="delimiter">&quot;</span><span class="content">--file</span><span class="delimiter">&quot;</span></span> }, paramLabel = <span class="string"><span class="delimiter">&quot;</span><span class="content">ARCHIVE</span><span class="delimiter">&quot;</span></span>, description = <span class="string"><span class="delimiter">&quot;</span><span class="content">the archive file</span><span class="delimiter">&quot;</span></span>)
     <span class="predefined-type">File</span> archive;
 
     <span class="annotation">@Parameters</span>(paramLabel = <span class="string"><span class="delimiter">&quot;</span><span class="content">FILE</span><span class="delimiter">&quot;</span></span>, description = <span class="string"><span class="delimiter">&quot;</span><span class="content">one ore more files to archive</span><span class="delimiter">&quot;</span></span>)
     <span class="predefined-type">File</span><span class="type">[]</span> files;
+
+    <span class="annotation">@Option</span>(names = { <span class="string"><span class="delimiter">&quot;</span><span class="content">-h</span><span class="delimiter">&quot;</span></span>, <span class="string"><span class="delimiter">&quot;</span><span class="content">--help</span><span class="delimiter">&quot;</span></span> }, help = <span class="predefined-constant">true</span>, description = <span class="string"><span class="delimiter">&quot;</span><span class="content">display a help message</span><span class="delimiter">&quot;</span></span>)
+    <span class="directive">private</span> <span class="type">boolean</span> helpRequested = <span class="predefined-constant">false</span>;
 }</code></pre>
 </div>
 </div>
@@ -732,15 +728,15 @@ <h3 id="_options">2.1. Options</h3>
 <pre class="CodeRay highlight"><code data-lang="java"><span class="predefined-type">String</span><span class="type">[]</span> args = { <span class="string"><span class="delimiter">&quot;</span><span class="content">-cf</span><span class="delimiter">&quot;</span></span>, <span class="string"><span class="delimiter">&quot;</span><span class="content">result.tar</span><span class="delimiter">&quot;</span></span>, <span class="string"><span class="delimiter">&quot;</span><span class="content">file1.txt</span><span class="delimiter">&quot;</span></span>, <span class="string"><span class="delimiter">&quot;</span><span class="content">file2.txt</span><span class="delimiter">&quot;</span></span> };
 Tar tar = CommandLine.parse(<span class="keyword">new</span> Tar(), args);
 
+<span class="keyword">assert</span> !tar.helpRequested;
 <span class="keyword">assert</span>  tar.create;
-<span class="keyword">assert</span> !tar.extract;
 <span class="keyword">assert</span>  tar.archive.equals(<span class="keyword">new</span> <span class="predefined-type">File</span>(<span class="string"><span class="delimiter">&quot;</span><span class="content">result.tar</span><span class="delimiter">&quot;</span></span>));
 <span class="keyword">assert</span>  <span class="predefined-type">Arrays</span>.equals(tar.files, <span class="keyword">new</span> <span class="predefined-type">File</span><span class="type">[]</span> {<span class="keyword">new</span> <span class="predefined-type">File</span>(<span class="string"><span class="delimiter">&quot;</span><span class="content">file1.txt</span><span class="delimiter">&quot;</span></span>), <span class="keyword">new</span> <span class="predefined-type">File</span>(<span class="string"><span class="delimiter">&quot;</span><span class="content">file2.txt</span><span class="delimiter">&quot;</span></span>)});</code></pre>
 </div>
 </div>
 <div class="paragraph">
 <p>Picocli supports <a href="http://pubs.opengroup.org/onlinepubs/9699919799/basedefs/V1_chap12.html#tag_12_02">POSIX clustered short options</a>:
-One or more options without option-arguments, followed by at most one option that takes an option-argument, should be accepted when grouped behind one '-' delimiter.</p>
+One or more options without option-arguments, followed by at most one option with an option-argument, can be grouped behind one '-' delimiter.</p>
 </div>
 <div class="paragraph">
 <p>For example, given this annotated class:</p>
@@ -773,16 +769,18 @@ <h3 id="_options">2.1. Options</h3>
 <div class="sect2">
 <h3 id="_positional_parameters">2.2. Positional Parameters</h3>
 <div class="paragraph">
-<p>Positional parameters (also called operands) are the command line arguments following the options.</p>
+<p>Positional parameters are the command line arguments following the options.</p>
 </div>
 <div class="paragraph">
-<p>Use the (zero-based) <code>index</code> attribute to specify exactly which parameters to capture. Omitting the <code>index</code> attribute means the field is initialized with all positional parameters (so the field should be a multi-value type like an array or a collection).</p>
+<p>Use the (zero-based) <code>index</code> attribute to specify exactly which parameters to capture.
+Omitting the <code>index</code> attribute means the field captures <em>all</em> positional parameters.
+Array or collection fields can capture multiple values.</p>
 </div>
 <div class="paragraph">
-<p>The <code>index</code> attribute accepts <em>range</em> values, so an annotation like <code>@Parameters(index="2..4")</code> captures arguments at index 2, 3 and 4. Range values can be <em>open-ended</em>. For example, <code>@Parameters(index="3..*")</code> captures all arguments from index 3 and up.</p>
+<p>The <code>index</code> attribute accepts <em>range</em> values, so an annotation like <code>@Parameters(index="2..4")</code> captures the arguments at index 2, 3 and 4. Range values can be <em>open-ended</em>. For example, <code>@Parameters(index="3..*")</code> captures all arguments from index 3 and up.</p>
 </div>
 <div class="paragraph">
-<p>The advantage of capturing individual parameters in separate fields is that you can enforce strong typing. For example:</p>
+<p>For example:</p>
 </div>
 <div class="listingblock">
 <div class="content">
@@ -790,14 +788,9 @@ <h3 id="_positional_parameters">2.2. Positional Parameters</h3>
     <span class="annotation">@Parameters</span>(hidden = <span class="predefined-constant">true</span>)  <span class="comment">// &quot;hidden&quot;: don't show this parameter in usage help message</span>
     <span class="predefined-type">List</span>&lt;<span class="predefined-type">String</span>&gt; allParameters; <span class="comment">// no &quot;index&quot; attribute: captures _all_ arguments (as Strings)</span>
 
-    <span class="annotation">@Parameters</span>(index = <span class="string"><span class="delimiter">&quot;</span><span class="content">0</span><span class="delimiter">&quot;</span></span>)
-    <span class="predefined-type">InetAddress</span> host;
-
-    <span class="annotation">@Parameters</span>(index = <span class="string"><span class="delimiter">&quot;</span><span class="content">1</span><span class="delimiter">&quot;</span></span>)
-    <span class="type">int</span> port;
-
-    <span class="annotation">@Parameters</span>(index = <span class="string"><span class="delimiter">&quot;</span><span class="content">2..*</span><span class="delimiter">&quot;</span></span>)
-    <span class="predefined-type">File</span><span class="type">[]</span> files;
+    <span class="annotation">@Parameters</span>(index = <span class="string"><span class="delimiter">&quot;</span><span class="content">0</span><span class="delimiter">&quot;</span></span>)    <span class="predefined-type">InetAddress</span> host;
+    <span class="annotation">@Parameters</span>(index = <span class="string"><span class="delimiter">&quot;</span><span class="content">1</span><span class="delimiter">&quot;</span></span>)    <span class="type">int</span> port;
+    <span class="annotation">@Parameters</span>(index = <span class="string"><span class="delimiter">&quot;</span><span class="content">2..*</span><span class="delimiter">&quot;</span></span>) <span class="predefined-type">File</span><span class="type">[]</span> files;
 }</code></pre>
 </div>
 </div>
@@ -822,19 +815,14 @@ <h3 id="_positional_parameters">2.2. Positional Parameters</h3>
 <div class="sect2">
 <h3 id="_double_dash_code_code">2.3. Double dash (<code>--</code>)</h3>
 <div class="paragraph">
-<p>When one of the command line arguments is two dashes without any characters attached (<code>--</code>), picocli interprets all following arguments as positional parameters, even arguments that match an option name.</p>
+<p>When one of the command line arguments is just two dashes without any characters attached (<code>--</code>), picocli interprets all following arguments as positional parameters, even arguments that match an option name.</p>
 </div>
 <div class="listingblock">
 <div class="content">
 <pre class="CodeRay highlight"><code data-lang="java"><span class="type">class</span> <span class="class">DoubleDashDemo</span> {
-    <span class="annotation">@Parameters</span>
-    <span class="predefined-type">List</span>&lt;<span class="predefined-type">String</span>&gt; params;
-
-    <span class="annotation">@Option</span>(names = <span class="string"><span class="delimiter">&quot;</span><span class="content">--files</span><span class="delimiter">&quot;</span></span>)
-    <span class="predefined-type">List</span>&lt;<span class="predefined-type">String</span>&gt; files;
-
-    <span class="annotation">@Option</span>(names = { <span class="string"><span class="delimiter">&quot;</span><span class="content">-v</span><span class="delimiter">&quot;</span></span>, <span class="string"><span class="delimiter">&quot;</span><span class="content">--verbose</span><span class="delimiter">&quot;</span></span> })
-    <span class="type">boolean</span> verbose;
+    <span class="annotation">@Option</span>(names = <span class="string"><span class="delimiter">&quot;</span><span class="content">-v</span><span class="delimiter">&quot;</span></span>)      <span class="type">boolean</span> verbose;
+    <span class="annotation">@Option</span>(names = <span class="string"><span class="delimiter">&quot;</span><span class="content">--files</span><span class="delimiter">&quot;</span></span>) <span class="predefined-type">List</span>&lt;<span class="predefined-type">String</span>&gt; files;
+    <span class="annotation">@Parameters</span>                <span class="predefined-type">List</span>&lt;<span class="predefined-type">String</span>&gt; params;
 }</code></pre>
 </div>
 </div>
@@ -848,7 +836,6 @@ <h3 id="_double_dash_code_code">2.3. Double dash (<code>--</code>)</h3>
 
 <span class="keyword">assert</span> demo.verbose;
 <span class="keyword">assert</span> demo.files == <span class="predefined-constant">null</span>;
-<span class="keyword">assert</span> demo.params != <span class="predefined-constant">null</span> &amp;&amp; demo.params.length == <span class="integer">3</span>;
 <span class="keyword">assert</span> demo.params.equals(<span class="predefined-type">Arrays</span>.asList(<span class="string"><span class="delimiter">&quot;</span><span class="content">--files</span><span class="delimiter">&quot;</span></span>, <span class="string"><span class="delimiter">&quot;</span><span class="content">file1</span><span class="delimiter">&quot;</span></span>, <span class="string"><span class="delimiter">&quot;</span><span class="content">file2</span><span class="delimiter">&quot;</span></span>));</code></pre>
 </div>
 </div>
@@ -1037,7 +1024,7 @@ <h2 id="_multiple_values">4. Multiple Values</h2>
 <p>Arity is the number of parameters that will be consumed by an option.</p>
 </div>
 <div class="sect2">
-<h3 id="_default">4.1. Default</h3>
+<h3 id="_default_arity">4.1. Default Arity</h3>
 <div class="paragraph">
 <p>The default arity value of an <code>@Option</code> or <code>@Parameters</code> field depends on its type.</p>
 </div>
@@ -1135,7 +1122,7 @@ <h3 id="_multiple_occurrences">4.4. Multiple Occurrences</h3>
 <h2 id="_required_arguments">5. Required Arguments</h2>
 <div class="sectionbody">
 <div class="sect2">
-<h3 id="_options_2">5.1. Options</h3>
+<h3 id="_required_options">5.1. Required Options</h3>
 <div class="paragraph">
 <p>Options can be marked <code>required</code> to make it mandatory for the user to specify them on the command line. When a required option is not specified, a <code>MissingParameterException</code> is thrown from the <code>parse</code> method. For example:</p>
 </div>
@@ -1170,7 +1157,7 @@ <h3 id="_options_2">5.1. Options</h3>
 </div>
 </div>
 <div class="sect2">
-<h3 id="_parameters">5.2. Parameters</h3>
+<h3 id="_required_parameters">5.2. Required Parameters</h3>
 <div class="paragraph">
 <p>Use the <code>arity</code> attribute to make <code>@Parameters</code> mandatory:</p>
 </div>
@@ -1709,22 +1696,6 @@ <h3 id="_usage_help_with_styles_and_colors">8.2. Usage Help with Styles and Colo
 Similarly, <code>fg(&lt;color&gt;)</code> explicitly sets the foreground color.</p>
 </div>
 <div class="paragraph">
-<p>Custom RGB <a href="https://en.wikipedia.org/wiki/ANSI_escape_code#Colors">colors</a> (ISO-8613-3 24-bit foreground and background colors) can be specified in any format supported by the <code>Color.decode()</code> method.
-For example, <code>fg(Ox9933EE)</code> renders a color equivalent to <code>java.awt.Color.decode(Ox9933EE)</code>.</p>
-</div>
-<div class="admonitionblock caution">
-<table>
-<tr>
-<td class="icon">
-<i class="fa icon-caution" title="Caution"></i>
-</td>
-<td class="content">
-Not all terminals support ISO-8613-3.
-</td>
-</tr>
-</table>
-</div>
-<div class="paragraph">
 <p>The example below shows how this can be used to add colors and styles to the headings and descriptions of a usage help message:</p>
 </div>
 <div class="listingblock">
@@ -1756,9 +1727,34 @@ <h3 id="_usage_help_with_styles_and_colors">8.2. Usage Help with Styles and Colo
 </div>
 </div>
 <div class="sect2">
-<h3 id="_configuring_fixed_elements">8.3. Configuring Fixed Elements</h3>
+<h3 id="_more_colors">8.3. More Colors</h3>
+<div class="paragraph">
+<p>Most terminals support a <a href="https://en.wikipedia.org/wiki/ANSI_escape_code#Colors">256 color indexed palette</a>:</p>
+</div>
+<div class="listingblock">
+<div class="content">
+<pre>0x00-0x07:  standard colors (the named colors)
+0x08-0x0F:  high intensity colors (often similar to named colors + bold style)
+0x10-0xE7:  6 × 6 × 6 cube (216 colors): 16 + 36 × r + 6 × g + b (0 ≤ r, g, b ≤ 5)
+0xE8-0xFF:  grayscale from black to white in 24 steps</pre>
+</div>
+</div>
+<div class="paragraph">
+<p>Colors from the 256 color palette can be specified by their index values or by their RGB components.
+RGB components must be separated by a semicolon <code>;</code> and each component must be between <code>0</code> and <code>5</code>, inclusive.</p>
+</div>
+<div class="paragraph">
+<p>For example, <code>@|bg(0;5;0) text with red=0, green=5, blue=0 background|@</code>,
+or <code>@|fg(46) the same color by index, as foreground color|@</code>.</p>
+</div>
+<div class="paragraph">
+<p><span class="image"><img src="images/256colors.png" alt="256 color indexed palette"></span></p>
+</div>
+</div>
+<div class="sect2">
+<h3 id="_configuring_fixed_elements">8.4. Configuring Fixed Elements</h3>
 <div class="sect3">
-<h4 id="_color_scheme">8.3.1. Color Scheme</h4>
+<h4 id="_color_scheme">8.4.1. Color Scheme</h4>
 <div class="paragraph">
 <p>Picocli uses a default color scheme for options, parameters and commands.
 There are no annotations to modify this color scheme, but it can be changed programmatically.</p>
@@ -1781,7 +1777,7 @@ <h4 id="_color_scheme">8.3.1. Color Scheme</h4>
 </div>
 </div>
 <div class="sect3">
-<h4 id="_color_scheme_overrides">8.3.2. Color Scheme Overrides</h4>
+<h4 id="_color_scheme_overrides">8.4.2. Color Scheme Overrides</h4>
 <div class="paragraph">
 <p>The following system properties override the color scheme styles. This allows end users to adjust for their individual terminal color setup.</p>
 </div>
@@ -1808,12 +1804,12 @@ <h4 id="_color_scheme_overrides">8.3.2. Color Scheme Overrides</h4>
 </div>
 </div>
 <div class="sect2">
-<h3 id="_supported_platforms">8.4. Supported Platforms</h3>
+<h3 id="_supported_platforms">8.5. Supported Platforms</h3>
 <div class="paragraph">
 <p>Picocli will only emit ANSI escape codes on supported platforms.</p>
 </div>
 <div class="sect3">
-<h4 id="_unix_and_linux">8.4.1. Unix and Linux</h4>
+<h4 id="_unix_and_linux">8.5.1. Unix and Linux</h4>
 <div class="paragraph">
 <p>Most Unix and Linux platforms support ANSI colors natively.
 On Windows, when picocli detects it is running under a Unix variant like Cygwin or MSYS(2) on Windows
@@ -1821,7 +1817,7 @@ <h4 id="_unix_and_linux">8.4.1. Unix and Linux</h4>
 </div>
 </div>
 <div class="sect3">
-<h4 id="_windows">8.4.2. Windows</h4>
+<h4 id="_windows">8.5.2. Windows</h4>
 <div class="paragraph">
 <p>Starting from Windows 10 the Windows console <a href="https://msdn.microsoft.com/en-us/library/windows/desktop/mt638032(v=vs.85).aspx">supports ANSI escape sequences</a>, but <a href="http://www.nivot.org/blog/post/2016/02/04/Windows-10-TH2-(v1511)-Console-Host-Enhancements">they may need to be enabled</a>.</p>
 </div>
@@ -1861,7 +1857,7 @@ <h4 id="_windows">8.4.2. Windows</h4>
 </div>
 </div>
 <div class="sect2">
-<h3 id="_forcing_ansi_on_off">8.5. Forcing ANSI On/Off</h3>
+<h3 id="_forcing_ansi_on_off">8.6. Forcing ANSI On/Off</h3>
 <div class="paragraph">
 <p>You can force picocli to either always use ANSI codes or never use ANSI codes regardless of the platform:</p>
 </div>
@@ -2102,8 +2098,10 @@ <h3 id="_usage_help_for_subcommands">10.3. Usage Help for Subcommands</h3>
 </div>
 </div>
 <div class="sect1">
-<h2 id="_less_boilerplate">11. Less Boilerplate</h2>
+<h2 id="_tips_tricks">11. Tips &amp; Tricks</h2>
 <div class="sectionbody">
+<div class="sect2">
+<h3 id="_less_boilerplate">11.1. Less Boilerplate</h3>
 <div class="paragraph">
 <p>You can omit some of the boilerplate code from your application when the annotated object implements <code>Runnable</code>:</p>
 </div>
@@ -2131,12 +2129,8 @@ <h2 id="_less_boilerplate">11. Less Boilerplate</h2>
 <p>Note that the <code>CommandLine.run</code> convenience method cannot be used with subcommands.</p>
 </div>
 </div>
-</div>
-<div class="sect1">
-<h2 id="_tips_tricks">12. Tips &amp; Tricks</h2>
-<div class="sectionbody">
 <div class="sect2">
-<h3 id="_boolean_parameters">12.1. Boolean Parameters</h3>
+<h3 id="_boolean_parameters">11.2. Boolean Parameters</h3>
 <div class="paragraph">
 <p>It is possible to let end users explicitly specify "true" or "false" as a parameter for a boolean option by defining an explicit <a href="#_arity">Arity</a> attribute. A boolean option with <code>arity = "0..1"</code> accepts zero to one parameters, <code>arity = "1"</code> means the option <em>must</em> have one parameter. For example:</p>
 </div>
@@ -2167,7 +2161,7 @@ <h3 id="_boolean_parameters">12.1. Boolean Parameters</h3>
 </div>
 </div>
 <div class="sect2">
-<h3 id="_hexadecimal_values">12.2. Hexadecimal Values</h3>
+<h3 id="_hexadecimal_values">11.3. Hexadecimal Values</h3>
 <div class="paragraph">
 <p>Numeric values are interpreted as decimal numbers by default. If you want picocli to be more flexible, you can
 register a custom type converter that delegates to the <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Integer.html#decode-java.lang.String-">decode</a> method to convert strings to numbers.</p>
@@ -2219,9 +2213,9 @@ <h3 id="_hexadecimal_values">12.2. Hexadecimal Values</h3>
 </div>
 </div>
 <div class="sect2">
-<h3 id="_option_parameter_separators_2">12.3. Option-Parameter Separators</h3>
+<h3 id="_option_parameter_separators_2">11.4. Option-Parameter Separators</h3>
 <div class="sect3">
-<h4 id="_default_separators">12.3.1. Default Separators</h4>
+<h4 id="_default_separators">11.4.1. Default Separators</h4>
 <div class="paragraph">
 <p>Options may take an <em>option parameter</em> (also called <em>option-argument</em>).
 For POSIX-style short options (like <code>-f</code> or <code>-c</code>), the option parameter may be attached to the option,
@@ -2251,7 +2245,7 @@ <h4 id="_default_separators">12.3.1. Default Separators</h4>
 </div>
 </div>
 <div class="sect3">
-<h4 id="_custom_separators">12.3.2. Custom Separators</h4>
+<h4 id="_custom_separators">11.4.2. Custom Separators</h4>
 <div class="paragraph">
 <p>The separator string can be customized programmatically or declaratively.</p>
 </div>
@@ -2289,7 +2283,7 @@ <h4 id="_custom_separators">12.3.2. Custom Separators</h4>
 </div>
 </div>
 <div class="sect2">
-<h3 id="_subclassing_for_reuse">12.4. Subclassing for Reuse</h3>
+<h3 id="_subclassing_for_reuse">11.5. Subclassing for Reuse</h3>
 <div class="paragraph">
 <p>Picocli will walk the class hierarchy to check for annotations, so you can declare common @Options and @Command attributes on a superclass and override these fields or attributes on a subclass.</p>
 </div>
@@ -2336,7 +2330,7 @@ <h3 id="_subclassing_for_reuse">12.4. Subclassing for Reuse</h3>
 </div>
 </div>
 <div class="sect2">
-<h3 id="_best_practices_for_command_line_interfaces">12.5. Best Practices for Command Line Interfaces</h3>
+<h3 id="_best_practices_for_command_line_interfaces">11.6. Best Practices for Command Line Interfaces</h3>
 <div class="paragraph">
 <p>When designing your command line application,
 the <a href="https://www.gnu.org/prep/standards/html_node/Command_002dLine-Interfaces.html#Command_002dLine-Interfaces">GNU recommendations</a> for command line interfaces and <a href="http://pubs.opengroup.org/onlinepubs/9699919799/basedefs/V1_chap12.html#tag_12_02">POSIX Utility Guidelines</a> may be useful. Generally, many applications use options for optional values and parameters for mandatory values.
@@ -2346,7 +2340,7 @@ <h3 id="_best_practices_for_command_line_interfaces">12.5. Best Practices for Co
 </div>
 </div>
 <div class="sect1">
-<h2 id="_api_javadoc">13. API Javadoc</h2>
+<h2 id="_api_javadoc">12. API Javadoc</h2>
 <div class="sectionbody">
 <div class="paragraph">
 <p>Picocli API Javadoc can be found <a href="https://remkop.github.io/picocli/apidocs">here</a>.</p>
@@ -2354,7 +2348,7 @@ <h2 id="_api_javadoc">13. API Javadoc</h2>
 </div>
 </div>
 <div class="sect1">
-<h2 id="_github_project">14. GitHub Project</h2>
+<h2 id="_github_project">13. GitHub Project</h2>
 <div class="sectionbody">
 <div class="paragraph">
 <p>The <a href="https://github.com/remkop/picocli">GitHub project</a> has the source code, tests, build scripts, etc.</p>
@@ -2365,7 +2359,7 @@ <h2 id="_github_project">14. GitHub Project</h2>
 </div>
 </div>
 <div class="sect1">
-<h2 id="_issue_tracker">15. Issue Tracker</h2>
+<h2 id="_issue_tracker">14. Issue Tracker</h2>
 <div class="sectionbody">
 <div class="paragraph">
 <p>Please use the <a href="https://github.com/remkop/picocli/issues">Issue Tracker</a> to report bugs or request features.</p>
@@ -2373,7 +2367,7 @@ <h2 id="_issue_tracker">15. Issue Tracker</h2>
 </div>
 </div>
 <div class="sect1">
-<h2 id="_license">16. License</h2>
+<h2 id="_license">15. License</h2>
 <div class="sectionbody">
 <div class="paragraph">
 <p>Picocli is licensed under the <a href="https://github.com/remkop/picocli/blob/master/LICENSE">Apache License 2.0</a>.</p>
@@ -2381,7 +2375,7 @@ <h2 id="_license">16. License</h2>
 </div>
 </div>
 <div class="sect1">
-<h2 id="_releases">17. Releases</h2>
+<h2 id="_releases">16. Releases</h2>
 <div class="sectionbody">
 <div class="paragraph">
 <p>Previous versions are available from the GitHub project <a href="https://github.com/remkop/picocli/releases">Releases</a>.</p>
@@ -2389,7 +2383,7 @@ <h2 id="_releases">17. Releases</h2>
 </div>
 </div>
 <div class="sect1">
-<h2 id="_download">18. Download</h2>
+<h2 id="_download">17. Download</h2>
 <div class="sectionbody">
 <div class="admonitionblock note">
 <table>
@@ -2525,7 +2519,7 @@ <h2 id="_download">18. Download</h2>
  */</span>
 <span class="directive">public</span> <span class="type">class</span> <span class="class">CommandLine</span> {
     <span class="comment">/** This is picocli version {@value}. */</span>
-    <span class="directive">public</span> <span class="directive">static</span> <span class="directive">final</span> <span class="predefined-type">String</span> VERSION = <span class="string"><span class="delimiter">&quot;</span><span class="content">0.9.4-SNAPSHOT</span><span class="delimiter">&quot;</span></span>;
+    <span class="directive">public</span> <span class="directive">static</span> <span class="directive">final</span> <span class="predefined-type">String</span> VERSION = <span class="string"><span class="delimiter">&quot;</span><span class="content">0.9.4</span><span class="delimiter">&quot;</span></span>;
 
     <span class="comment">/** Set this field to {@code true} to force ANSI escape sequences on, or to {@code false} to force ANSI escape
      * sequences off. The default ({@code null}) is to enable ANSI escape sequences on supported platforms.  */</span>
@@ -2555,7 +2549,8 @@ <h2 id="_download">18. Download</h2>
         commandMap.put(name, annotatedObject);
         <span class="keyword">return</span> <span class="local-variable">this</span>;
     }
-    <span class="comment">/** Returns a map with the registered sub-commands. */</span>
+    <span class="comment">/** Returns a map with the {@linkplain #addCommand(String, Object) registered} sub-commands.
+     * @return a map with the registered sub-commands */</span>
     <span class="directive">public</span> <span class="predefined-type">Map</span>&lt;<span class="predefined-type">String</span>, <span class="predefined-type">Object</span>&gt; getCommands() {
         <span class="keyword">return</span> <span class="keyword">new</span> <span class="predefined-type">LinkedHashMap</span>&lt;<span class="predefined-type">String</span>, <span class="predefined-type">Object</span>&gt;(commandMap);
     }
@@ -2755,12 +2750,14 @@ <h2 id="_download">18. Download</h2>
         <span class="keyword">return</span> <span class="local-variable">this</span>;
     }
 
-    <span class="comment">/** Returns the String that separates option names from option values. {@code '='} by default. */</span>
+    <span class="comment">/** Returns the String that separates option names from option values when parsing command line options. {@code '='} by default.
+     * @return the String the parser uses to separate option names from option values */</span>
     <span class="directive">public</span> <span class="predefined-type">String</span> getSeparator() {
         <span class="keyword">return</span> interpreter.separator;
     }
 
-    <span class="comment">/** Sets the String that separates option names from option values to the specified value. */</span>
+    <span class="comment">/** Sets the String the parser uses to separate option names from option values to the specified value.
+     * @param separator the String that separates option names from option values */</span>
     <span class="directive">public</span> <span class="type">void</span> setSeparator(<span class="predefined-type">String</span> separator) {
         interpreter.separator = Assert.notNull(separator, <span class="string"><span class="delimiter">&quot;</span><span class="content">separator</span><span class="delimiter">&quot;</span></span>);
     }
@@ -3094,18 +3091,23 @@ <h2 id="_download">18. Download</h2>
     <span class="annotation">@Target</span>(<span class="predefined-type">ElementType</span>.TYPE)
     <span class="directive">public</span> <span class="annotation">@interface</span> Command {
         <span class="comment">/** Program name to show in the synopsis. If omitted, {@code &quot;&lt;main class&gt;&quot;} is used.
+         * @return the program name to show in the synopsis
          * @see Help#commandName */</span>
         <span class="predefined-type">String</span> name() <span class="keyword">default</span> <span class="string"><span class="delimiter">&quot;</span><span class="content">&lt;main class&gt;</span><span class="delimiter">&quot;</span></span>;
 
         <span class="comment">/** String that separates options from option parameters. Default is {@code &quot;=&quot;}. Spaces are also accepted.
-         * @see Help#separator */</span>
+         * @return the string that separates options from option parameters, used both when parsing and when generating usage help
+         * @see Help#separator
+         * @see CommandLine#setSeparator(String) */</span>
         <span class="predefined-type">String</span> separator() <span class="keyword">default</span> <span class="string"><span class="delimiter">&quot;</span><span class="content">=</span><span class="delimiter">&quot;</span></span>;
 
         <span class="comment">/** Set the heading preceding the header section. May contain embedded {@linkplain java.util.Formatter format specifiers}.
+         * @return the heading preceding the header section
          * @see Help#headerHeading(Object...)  */</span>
         <span class="predefined-type">String</span> headerHeading() <span class="keyword">default</span> <span class="string"><span class="delimiter">&quot;</span><span class="delimiter">&quot;</span></span>;
 
         <span class="comment">/** Optional summary description of the command, shown before the synopsis.
+         * @return summary description of the command
          * @see Help#header
          * @see Help#header(Object...)  */</span>
         <span class="predefined-type">String</span><span class="type">[]</span> header() <span class="keyword">default</span> {};
@@ -3113,62 +3115,75 @@ <h2 id="_download">18. Download</h2>
         <span class="comment">/** Set the heading preceding the synopsis text. May contain embedded
          * {@linkplain java.util.Formatter format specifiers}. The default heading is {@code &quot;Usage: &quot;} (without a line
          * break between the heading and the synopsis text).
+         * @return the heading preceding the synopsis text
          * @see Help#synopsisHeading(Object...)  */</span>
         <span class="predefined-type">String</span> synopsisHeading() <span class="keyword">default</span> <span class="string"><span class="delimiter">&quot;</span><span class="content">Usage: </span><span class="delimiter">&quot;</span></span>;
 
         <span class="comment">/** Specify {@code true} to generate an abbreviated synopsis like {@code &quot;&lt;main&gt; [OPTIONS] [PARAMETERS...]&quot;}.
          * By default, a detailed synopsis with individual option names and parameters is generated.
+         * @return whether the synopsis should be abbreviated
          * @see Help#abbreviateSynopsis
          * @see Help#abbreviatedSynopsis()
          * @see Help#detailedSynopsis(Comparator, boolean) */</span>
         <span class="type">boolean</span> abbreviateSynopsis() <span class="keyword">default</span> <span class="predefined-constant">false</span>;
 
         <span class="comment">/** Specify one or more custom synopsis lines to display instead of an auto-generated synopsis.
+         * @return custom synopsis text to replace the auto-generated synopsis
          * @see Help#customSynopsis
          * @see Help#customSynopsis(Object...) */</span>
         <span class="predefined-type">String</span><span class="type">[]</span> customSynopsis() <span class="keyword">default</span> {};
 
         <span class="comment">/** Set the heading preceding the description section. May contain embedded {@linkplain java.util.Formatter format specifiers}.
+         * @return the heading preceding the description section
          * @see Help#descriptionHeading(Object...)  */</span>
         <span class="predefined-type">String</span> descriptionHeading() <span class="keyword">default</span> <span class="string"><span class="delimiter">&quot;</span><span class="delimiter">&quot;</span></span>;
 
         <span class="comment">/** Optional text to display between the synopsis line(s) and the list of options.
+         * @return description of this command
          * @see Help#description
          * @see Help#description(Object...) */</span>
         <span class="predefined-type">String</span><span class="type">[]</span> description() <span class="keyword">default</span> {};
 
         <span class="comment">/** Set the heading preceding the parameters list. May contain embedded {@linkplain java.util.Formatter format specifiers}.
+         * @return the heading preceding the parameters list
          * @see Help#parameterListHeading(Object...)  */</span>
         <span class="predefined-type">String</span> parameterListHeading() <span class="keyword">default</span> <span class="string"><span class="delimiter">&quot;</span><span class="delimiter">&quot;</span></span>;
 
         <span class="comment">/** Set the heading preceding the options list. May contain embedded {@linkplain java.util.Formatter format specifiers}.
+         * @return the heading preceding the options list
          * @see Help#optionListHeading(Object...)  */</span>
         <span class="predefined-type">String</span> optionListHeading() <span class="keyword">default</span> <span class="string"><span class="delimiter">&quot;</span><span class="delimiter">&quot;</span></span>;
 
         <span class="comment">/** Specify {@code false} to show Options in declaration order. The default is to sort alphabetically.
+         * @return whether options should be shown in alphabetic order.
          * @see Help#sortOptions */</span>
         <span class="type">boolean</span> sortOptions() <span class="keyword">default</span> <span class="predefined-constant">true</span>;
 
         <span class="comment">/** Prefix required options with this character in the options list. The default is no marker: the synopsis
          * indicates which options and parameters are required.
+         * @return the character to show in the options list to mark required options
          * @see Help#requiredOptionMarker */</span>
         <span class="type">char</span> requiredOptionMarker() <span class="keyword">default</span> <span class="string"><span class="delimiter">'</span><span class="content"> </span><span class="delimiter">'</span></span>;
 
         <span class="comment">/** Specify {@code true} to show default values in the description column of the options list (except for
          * boolean options). False by default.
+         * @return whether the default values for options and parameters should be shown in the description column
          * @see Help#showDefaultValues */</span>
         <span class="type">boolean</span> showDefaultValues() <span class="keyword">default</span> <span class="predefined-constant">false</span>;
 
         <span class="comment">/** Set the heading preceding the sub-commands list. May contain embedded {@linkplain java.util.Formatter format specifiers}.
          * The default heading is {@code &quot;Commands:%n&quot;} (with a line break at the end).
+         * @return the heading preceding the sub-commands list
          * @see Help#commandListHeading(Object...)  */</span>
         <span class="predefined-type">String</span> commandListHeading() <span class="keyword">default</span> <span class="string"><span class="delimiter">&quot;</span><span class="content">Commands:%n</span><span class="delimiter">&quot;</span></span>;
 
         <span class="comment">/** Set the heading preceding the footer section. May contain embedded {@linkplain java.util.Formatter format specifiers}.
+         * @return the heading preceding the footer section
          * @see Help#footerHeading(Object...)  */</span>
         <span class="predefined-type">String</span> footerHeading() <span class="keyword">default</span> <span class="string"><span class="delimiter">&quot;</span><span class="delimiter">&quot;</span></span>;
 
         <span class="comment">/** Optional text to display after the list of options.
+         * @return text to display after the list of options
          * @see Help#footer
          * @see Help#footer(Object...) */</span>
         <span class="predefined-type">String</span><span class="type">[]</span> footer() <span class="keyword">default</span> {};
@@ -3245,12 +3260,16 @@ <h2 id="_download">18. Download</h2>
             <span class="local-variable">this</span>.originalValue = originalValue;
         }
         <span class="comment">/** Returns a new {@code Arity} based on the Option annotation on the specified field, or the field type if no
-         * arity was specified. */</span>
+         * arity was specified.
+         * @param field the field whose Option annotation to inspect
+         * @return a new {@code Arity} based on the Option annotation on the specified field */</span>
         <span class="directive">public</span> <span class="directive">static</span> Arity forOption(<span class="predefined-type">Field</span> field) {
             <span class="keyword">return</span> adjustForType(Arity.valueOf(field.getAnnotation(<span class="predefined-type">Option</span>.class).arity()), field);
         }
         <span class="comment">/** Returns a new {@code Arity} based on the Parameters annotation on the specified field, or the field type
-         * if no arity was specified. */</span>
+         * if no arity was specified.
+         * @param field the field whose Parameters annotation to inspect
+         * @return a new {@code Arity} based on the Parameters annotation on the specified field */</span>
         <span class="directive">public</span> <span class="directive">static</span> Arity forParameters(<span class="predefined-type">Field</span> field) {
             <span class="keyword">return</span> adjustForType(Arity.valueOf(field.getAnnotation(Parameters.class).arity()), field);
         }
@@ -3258,7 +3277,9 @@ <h2 id="_download">18. Download</h2>
             <span class="keyword">return</span> result.isUnspecified ? forType(field.getType()) : result;
         }
         <span class="comment">/** Returns a new {@code Arity} based on the specified type: booleans have arity 0, arrays or Collections have
-         * arity &quot;0..*&quot;, and other types have arity 1. */</span>
+         * arity &quot;0..*&quot;, and other types have arity 1.
+         * @param type the type whose default arity to return
+         * @return a new {@code Arity} based on the specified type */</span>
         <span class="directive">public</span> <span class="directive">static</span> Arity forType(<span class="predefined-type">Class</span>&lt;?&gt; type) {
             <span class="keyword">if</span> (isBoolean(type)) {
                 <span class="keyword">return</span> Arity.valueOf(<span class="string"><span class="delimiter">&quot;</span><span class="content">0</span><span class="delimiter">&quot;</span></span>);
@@ -3270,7 +3291,9 @@ <h2 id="_download">18. Download</h2>
         <span class="comment">/** Leniently parses the specified String as an {@code Arity} value and return the result. An arity string can
          * be a fixed integer value or a range of the form {@code MIN_VALUE + &quot;..&quot; + MAX_VALUE}. If the
          * {@code MIN_VALUE} string is not numeric, the minimum is zero. If the {@code MAX_VALUE} is not numeric, the
-         * arity is taken to be variable and the maximum is {@code Integer.MAX_VALUE}.*/</span>
+         * arity is taken to be variable and the maximum is {@code Integer.MAX_VALUE}.
+         * @param arity the arity string to parse
+         * @return a new {@code Arity} value */</span>
         <span class="directive">public</span> <span class="directive">static</span> Arity valueOf(<span class="predefined-type">String</span> arity) {
             arity = arity.trim();
             <span class="type">boolean</span> unspecified = arity.length() == <span class="integer">0</span> || arity.startsWith(<span class="string"><span class="delimiter">&quot;</span><span class="content">..</span><span class="delimiter">&quot;</span></span>); <span class="comment">// || arity.endsWith(&quot;..&quot;);</span>
@@ -4044,9 +4067,9 @@ <h2 id="_download">18. Download</h2>
      * &lt;p&gt;The {@link Command} annotation provides the easiest way to customize usage help messages. See
      * the &lt;a href=&quot;https://remkop.github.io/picocli/index.html#_usage_help&quot;&gt;Manual&lt;/a&gt; for details.&lt;/p&gt;
      * &lt;p&gt;This Help class provides high-level functions to create sections of the usage help message and headings
-     * for these sections. Instead of calling the {@link CommandLine#usage(PrintStream, ColorScheme)} method,
-     * application authors may want to create a custom usage help message by reorganizing sections in a different order
-     * and/or adding custom sections.&lt;/p&gt;
+     * for these sections. Instead of calling the {@link CommandLine#usage(PrintStream, CommandLine.Help.ColorScheme)}
+     * method, application authors may want to create a custom usage help message by reorganizing sections in a
+     * different order and/or adding custom sections.&lt;/p&gt;
      * &lt;p&gt;Finally, the Help class contains inner classes and interfaces that can be used to create custom help messages.&lt;/p&gt;
      * &lt;h4&gt;IOptionRenderer and IParameterRenderer&lt;/h4&gt;
      * &lt;p&gt;Renders a field annotated with {@link Option} or {@link Parameters} to an array of {@link Text} values.
@@ -4154,13 +4177,16 @@ <h2 id="_download">18. Download</h2>
         <span class="directive">public</span> <span class="predefined-type">String</span> footerHeading;
 
         <span class="comment">/** Constructs a new {@code Help} instance with a default color scheme, initialized from annotatations
-         * on the specified class and superclasses. */</span>
+         * on the specified class and superclasses.
+         * @param annotatedObject the annotated object to create usage help for */</span>
         <span class="directive">public</span> Help(<span class="predefined-type">Object</span> annotatedObject) {
             <span class="local-variable">this</span>(annotatedObject, defaultColorScheme());
         }
 
         <span class="comment">/** Constructs a new {@code Help} instance with the specified color scheme, initialized from annotatations
-         * on the specified class and superclasses. */</span>
+         * on the specified class and superclasses.
+         * @param annotatedObject the annotated object to create usage help for
+         * @param colorScheme the color scheme to use */</span>
         <span class="directive">public</span> Help(<span class="predefined-type">Object</span> annotatedObject, ColorScheme colorScheme) {
             <span class="local-variable">this</span>.annotatedObject = Assert.notNull(annotatedObject, <span class="string"><span class="delimiter">&quot;</span><span class="content">annotatedObject</span><span class="delimiter">&quot;</span></span>);
             <span class="local-variable">this</span>.colorScheme = Assert.notNull(colorScheme, <span class="string"><span class="delimiter">&quot;</span><span class="content">colorScheme</span><span class="delimiter">&quot;</span></span>).applySystemProperties();
@@ -4251,7 +4277,8 @@ <h2 id="_download">18. Download</h2>
         }
 
         <span class="comment">/** Generates a generic synopsis like {@code &lt;command name&gt; [OPTIONS] [PARAM1 [PARAM2]...]}, omitting parts
-         * that don't apply to the command (e.g., does not show [OPTIONS] if the command has no options). */</span>
+         * that don't apply to the command (e.g., does not show [OPTIONS] if the command has no options).
+         * @return a generic synopsis */</span>
         <span class="directive">public</span> <span class="predefined-type">String</span> abbreviatedSynopsis() {
             <span class="predefined-type">StringBuilder</span> sb = <span class="keyword">new</span> <span class="predefined-type">StringBuilder</span>();
             <span class="keyword">if</span> (!optionFields.isEmpty()) { <span class="comment">// only show if annotated object actually has options</span>
@@ -4268,7 +4295,10 @@ <h2 id="_download">18. Download</h2>
         }
 
         <span class="comment">/** Generates a detailed synopsis message showing all options and parameters. Follows the unix convention of
-         * showing optional options and parameters in square brackets ({@code [ ]}). */</span>
+         * showing optional options and parameters in square brackets ({@code [ ]}).
+         * @param optionSort comparator to sort options or {@code null} if options should not be sorted
+         * @param clusterBooleanOptions {@code true} if boolean short options should be clustered into a single string
+         * @return a detailed synopsis */</span>
         <span class="directive">public</span> <span class="predefined-type">String</span> detailedSynopsis(<span class="predefined-type">Comparator</span>&lt;<span class="predefined-type">Field</span>&gt; optionSort, <span class="type">boolean</span> clusterBooleanOptions) {
             Text optionText = <span class="keyword">new</span> Text(<span class="integer">0</span>);
             <span class="predefined-type">List</span>&lt;<span class="predefined-type">Field</span>&gt; fields = <span class="keyword">new</span> <span class="predefined-type">ArrayList</span>&lt;<span class="predefined-type">Field</span>&gt;(optionFields); <span class="comment">// iterate in declaration order</span>
@@ -4379,7 +4409,11 @@ <h2 id="_download">18. Download</h2>
             <span class="keyword">return</span> layout.toString();
         }
 
-        <span class="comment">/** Appends each of the specified values plus the specified separator to the specified StringBuilder and returns it. */</span>
+        <span class="comment">/** Formats each of the specified values and appends it to the specified StringBuilder.
+         * @param values the values to format and append to the StringBuilder
+         * @param sb the StringBuilder to collect the formatted strings
+         * @param params the parameters to pass to the format method when formatting each value
+         * @return the specified StringBuilder */</span>
         <span class="directive">public</span> <span class="directive">static</span> <span class="predefined-type">StringBuilder</span> join(<span class="predefined-type">String</span><span class="type">[]</span> values, <span class="predefined-type">StringBuilder</span> sb, <span class="predefined-type">Object</span>... params) {
             <span class="keyword">if</span> (values != <span class="predefined-constant">null</span>) {
                 TextTable table = <span class="keyword">new</span> TextTable(<span class="integer">80</span>);
@@ -4428,47 +4462,63 @@ <h2 id="_download">18. Download</h2>
             <span class="keyword">return</span> join(footer, <span class="keyword">new</span> <span class="predefined-type">StringBuilder</span>(), params).toString();
         }
 
-        <span class="comment">/** Returns the text displayed before the header text; the result of {@code String.format(headerHeading, params)}. */</span>
+        <span class="comment">/** Returns the text displayed before the header text; the result of {@code String.format(headerHeading, params)}.
+         * @param params the parameters to use to format the header heading
+         * @return the formatted header heading */</span>
         <span class="directive">public</span> <span class="predefined-type">String</span> headerHeading(<span class="predefined-type">Object</span>... params) {
             <span class="keyword">return</span> <span class="keyword">new</span> Text(format(headerHeading, params)).toString();
         }
-        <span class="comment">/** Returns the text displayed before the synopsis text; the result of {@code String.format(synopsisHeading, params)}. */</span>
+
+        <span class="comment">/** Returns the text displayed before the synopsis text; the result of {@code String.format(synopsisHeading, params)}.
+         * @param params the parameters to use to format the synopsis heading
+         * @return the formatted synopsis heading */</span>
         <span class="directive">public</span> <span class="predefined-type">String</span> synopsisHeading(<span class="predefined-type">Object</span>... params) {
             <span class="keyword">return</span> <span class="keyword">new</span> Text(format(synopsisHeading, params)).toString();
         }
 
         <span class="comment">/** Returns the text displayed before the description text; an empty string if there is no description,
-         * otherwise the result of {@code String.format(descriptionHeading, params)}. */</span>
+         * otherwise the result of {@code String.format(descriptionHeading, params)}.
+         * @param params the parameters to use to format the description heading
+         * @return the formatted description heading */</span>
         <span class="directive">public</span> <span class="predefined-type">String</span> descriptionHeading(<span class="predefined-type">Object</span>... params) {
             <span class="keyword">return</span> empty(descriptionHeading) ? <span class="string"><span class="delimiter">&quot;</span><span class="delimiter">&quot;</span></span> : <span class="keyword">new</span> Text(format(descriptionHeading, params)).toString();
         }
 
         <span class="comment">/** Returns the text displayed before the positional parameter list; an empty string if there are no positional
-         * parameters, otherwise the result of {@code String.format(parameterListHeading, params)}. */</span>
+         * parameters, otherwise the result of {@code String.format(parameterListHeading, params)}.
+         * @param params the parameters to use to format the parameter list heading
+         * @return the formatted parameter list heading */</span>
         <span class="directive">public</span> <span class="predefined-type">String</span> parameterListHeading(<span class="predefined-type">Object</span>... params) {
             <span class="keyword">return</span> positionalParametersFields.isEmpty() ? <span class="string"><span class="delimiter">&quot;</span><span class="delimiter">&quot;</span></span> : <span class="keyword">new</span> Text(format(parameterListHeading, params)).toString();
         }
 
         <span class="comment">/** Returns the text displayed before the option list; an empty string if there are no options,
-         * otherwise the result of {@code String.format(optionListHeading, params)}. */</span>
+         * otherwise the result of {@code String.format(optionListHeading, params)}.
+         * @param params the parameters to use to format the option list heading
+         * @return the formatted option list heading */</span>
         <span class="directive">public</span> <span class="predefined-type">String</span> optionListHeading(<span class="predefined-type">Object</span>... params) {
             <span class="keyword">return</span> optionFields.isEmpty() ? <span class="string"><span class="delimiter">&quot;</span><span class="delimiter">&quot;</span></span> : <span class="keyword">new</span> Text(format(optionListHeading, params)).toString();
         }
 
         <span class="comment">/** Returns the text displayed before the command list; an empty string if there are no commands,
-         * otherwise the result of {@code String.format(commandListHeading, params)}. */</span>
+         * otherwise the result of {@code String.format(commandListHeading, params)}.
+         * @param params the parameters to use to format the command list heading
+         * @return the formatted command list heading */</span>
         <span class="directive">public</span> <span class="predefined-type">String</span> commandListHeading(<span class="predefined-type">Object</span>... params) {
             <span class="keyword">return</span> commands.isEmpty() ? <span class="string"><span class="delimiter">&quot;</span><span class="delimiter">&quot;</span></span> : <span class="keyword">new</span> Text(format(commandListHeading, params)).toString();
         }
 
-        <span class="comment">/** Returns the text displayed before the footer text; the result of {@code String.format(footerHeading, params)}. */</span>
+        <span class="comment">/** Returns the text displayed before the footer text; the result of {@code String.format(footerHeading, params)}.
+         * @param params the parameters to use to format the footer heading
+         * @return the formatted footer heading */</span>
         <span class="directive">public</span> <span class="predefined-type">String</span> footerHeading(<span class="predefined-type">Object</span>... params) {
             <span class="keyword">return</span> <span class="keyword">new</span> Text(format(footerHeading, params)).toString();
         }
         <span class="directive">private</span> <span class="predefined-type">String</span> format(<span class="predefined-type">String</span> formatString,  <span class="predefined-type">Object</span><span class="type">[]</span> params) {
             <span class="keyword">return</span> formatString == <span class="predefined-constant">null</span> ? <span class="string"><span class="delimiter">&quot;</span><span class="delimiter">&quot;</span></span> : <span class="predefined-type">String</span>.format(formatString, params);
         }
-        <span class="comment">/** Returns a 2-column list with command names and the first line of their header or (if absent) description. */</span>
+        <span class="comment">/** Returns a 2-column list with command names and the first line of their header or (if absent) description.
+         * @return a usage help section describing the added commands */</span>
         <span class="directive">public</span> <span class="predefined-type">String</span> commandList() {
             <span class="keyword">if</span> (commands.isEmpty()) { <span class="keyword">return</span> <span class="string"><span class="delimiter">&quot;</span><span class="delimiter">&quot;</span></span>; }
             <span class="type">int</span> commandLength = maxLength(commands.keySet());
@@ -4498,7 +4548,8 @@ <h2 id="_download">18. Download</h2>
             <span class="keyword">return</span> result.toString();
         }
 
-        <span class="comment">/** Returns a {@code Layout} instance configured with the user preferences captured in this Help instance. */</span>
+        <span class="comment">/** Returns a {@code Layout} instance configured with the user preferences captured in this Help instance.
+         * @return a Layout */</span>
         <span class="directive">public</span> Layout createDefaultLayout() {
             <span class="keyword">return</span> <span class="keyword">new</span> Layout(colorScheme, <span class="keyword">new</span> TextTable(), createDefaultOptionRenderer(), createDefaultParameterRenderer());
         }
@@ -4514,6 +4565,7 @@ <h2 id="_download">18. Download</h2>
          * &lt;p&gt;Following this, there will be one row for each of the remaining elements of the {@link
          *   Option#description()} array, and these rows look like {@code {&quot;&quot;, &quot;&quot;, &quot;&quot;, &quot;&quot;, option.description()[i]}}.&lt;/p&gt;
          * &lt;p&gt;If configured, this option renderer adds an additional row to display the default field value.&lt;/p&gt;
+         * @return a new default OptionRenderer
          */</span>
         <span class="directive">public</span> IOptionRenderer createDefaultOptionRenderer() {
             DefaultOptionRenderer result = <span class="keyword">new</span> DefaultOptionRenderer();
@@ -4524,10 +4576,12 @@ <h2 id="_download">18. Download</h2>
             <span class="keyword">return</span> result;
         }
         <span class="comment">/** Returns a new minimal OptionRenderer which converts {@link Option Options} to a single row with two columns
-         * of text: an option name and a description. If multiple names or descriptions exist, the first value is used. */</span>
+         * of text: an option name and a description. If multiple names or descriptions exist, the first value is used.
+         * @return a new minimal OptionRenderer */</span>
         <span class="directive">public</span> <span class="directive">static</span> IOptionRenderer createMinimalOptionRenderer() {
             <span class="keyword">return</span> <span class="keyword">new</span> MinimalOptionRenderer();
         }
+
         <span class="comment">/** Returns a new default ParameterRenderer which converts {@link Parameters Parameters} to four columns of
          * text to match the default {@linkplain TextTable TextTable} column layout. The first row of values looks like this:
          * &lt;ol&gt;
@@ -4539,6 +4593,7 @@ <h2 id="_download">18. Download</h2>
          * &lt;p&gt;Following this, there will be one row for each of the remaining elements of the {@link
          *   Parameters#description()} array, and these rows look like {@code {&quot;&quot;, &quot;&quot;, &quot;&quot;, param.description()[i]}}.&lt;/p&gt;
          * &lt;p&gt;If configured, this parameter renderer adds an additional row to display the default field value.&lt;/p&gt;
+         * @return a new default ParameterRenderer
          */</span>
         <span class="directive">public</span> IParameterRenderer createDefaultParameterRenderer() {
             DefaultParameterRenderer result = <span class="keyword">new</span> DefaultParameterRenderer();
@@ -4546,11 +4601,14 @@ <h2 id="_download">18. Download</h2>
             <span class="keyword">return</span> result;
         }
         <span class="comment">/** Returns a new minimal ParameterRenderer which converts {@link Parameters Parameters} to a single row with
-         * two columns of text: an option name and a description. If multiple descriptions exist, the first value is used. */</span>
+         * two columns of text: an option name and a description. If multiple descriptions exist, the first value is used.
+         * @return a new minimal ParameterRenderer */</span>
         <span class="directive">public</span> <span class="directive">static</span> IParameterRenderer createMinimalParameterRenderer() {
             <span class="keyword">return</span> <span class="keyword">new</span> MinimalParameterRenderer();
         }
-        <span class="comment">/** Returns a value renderer that returns the {@code paramLabel} if defined or the field name otherwise. */</span>
+
+        <span class="comment">/** Returns a value renderer that returns the {@code paramLabel} if defined or the field name otherwise.
+         * @return a new minimal ParamLabelRenderer */</span>
         <span class="directive">public</span> <span class="directive">static</span> IParamLabelRenderer createMinimalParamLabelRenderer() {
             <span class="keyword">return</span> <span class="keyword">new</span> IParamLabelRenderer() {
                 <span class="directive">public</span> Text renderParameterLabel(<span class="predefined-type">Field</span> field, <span class="predefined-type">List</span>&lt;IStyle&gt; styles) {
@@ -4570,21 +4628,25 @@ <h2 id="_download">18. Download</h2>
         <span class="comment">/** Returns a new default value renderer that separates option parameters from their {@linkplain Option
          * options} with the specified separator string, surrounds optional parameters with {@code '['} and {@code ']'}
          * characters and uses ellipses (&quot;...&quot;) to indicate that any number of a parameter are allowed.
+         * @return a new default ParamLabelRenderer
          */</span>
         <span class="directive">public</span> IParamLabelRenderer createDefaultParamLabelRenderer() {
             <span class="keyword">return</span> <span class="keyword">new</span> DefaultParamLabelRenderer(separator);
         }
         <span class="comment">/** Sorts Fields annotated with {@code Option} by their option name in case-insensitive alphabetic order. If an
-         * Option has multiple names, the shortest name is used for the sorting. Help options follow non-help options. */</span>
+         * Option has multiple names, the shortest name is used for the sorting. Help options follow non-help options.
+         * @return a comparator that sorts fields by their option name in case-insensitive alphabetic order */</span>
         <span class="directive">public</span> <span class="directive">static</span> <span class="predefined-type">Comparator</span>&lt;<span class="predefined-type">Field</span>&gt; createShortOptionNameComparator() {
             <span class="keyword">return</span> <span class="keyword">new</span> SortByShortestOptionNameAlphabetically();
         }
         <span class="comment">/** Sorts Fields annotated with {@code Option} by their option {@linkplain Arity#max max arity} first, by
-         * {@linkplain Arity#min min arity} next, and by {@linkplain #createShortOptionNameComparator() option name} last. */</span>
+         * {@linkplain Arity#min min arity} next, and by {@linkplain #createShortOptionNameComparator() option name} last.
+         * @return a comparator that sorts fields by arity first, then their option name */</span>
         <span class="directive">public</span> <span class="directive">static</span> <span class="predefined-type">Comparator</span>&lt;<span class="predefined-type">Field</span>&gt; createShortOptionArityAndNameComparator() {
             <span class="keyword">return</span> <span class="keyword">new</span> SortByOptionArityAndNameAlphabetically();
         }
-        <span class="comment">/** Sorts short strings before longer strings. */</span>
+        <span class="comment">/** Sorts short strings before longer strings.
+         * @return a comparators that sorts short strings before longer strings */</span>
         <span class="directive">public</span> <span class="directive">static</span> <span class="predefined-type">Comparator</span>&lt;<span class="predefined-type">String</span>&gt; shortestFirst() {
             <span class="keyword">return</span> <span class="keyword">new</span> ShortestFirst();
         }
@@ -4733,10 +4795,14 @@ <h2 id="_download">18. Download</h2>
         <span class="directive">public</span> <span class="type">interface</span> <span class="class">IParamLabelRenderer</span> {
 
             <span class="comment">/** Returns a text rendering of the Option parameter or positional parameter; returns an empty string
-             * {@code &quot;&quot;} if the option is a boolean and does not take a parameter. */</span>
+             * {@code &quot;&quot;} if the option is a boolean and does not take a parameter.
+             * @param field the annotated field with a parameter label
+             * @param styles the styles to apply to the parameter label
+             * @return a text rendering of the Option parameter or positional parameter */</span>
             Text renderParameterLabel(<span class="predefined-type">Field</span> field, <span class="predefined-type">List</span>&lt;IStyle&gt; styles);
 
-            <span class="comment">/** Returns the separator between option name and param label */</span>
+            <span class="comment">/** Returns the separator between option name and param label.
+             * @return the separator between option name and param label */</span>
             <span class="predefined-type">String</span> separator();
         }
         <span class="comment">/**
@@ -4799,7 +4865,7 @@ <h2 id="_download">18. Download</h2>
          * &lt;p&gt;Delegates to the renderers to create {@link Text} values for the annotated fields, and uses a
          * {@link TextTable} to display these values in tabular format. Layout is responsible for deciding which values
          * to display where in the table. By default, Layout shows one option or parameter per table row.&lt;/p&gt;
-         * &lt;p&gt;Customize by overriding the {@link #layout(Field, Text[][])} method.&lt;/p&gt;
+         * &lt;p&gt;Customize by overriding the {@link #layout(Field, CommandLine.Help.Ansi.Text[][])} method.&lt;/p&gt;
          * @see IOptionRenderer rendering options to text
          * @see IParameterRenderer rendering parameters to text
          * @see TextTable showing values in a tabular format
@@ -4812,17 +4878,24 @@ <h2 id="_download">18. Download</h2>
 
             <span class="comment">/** Constructs a Layout with the specified color scheme, a new default TextTable, the
              * {@linkplain Help#createDefaultOptionRenderer() default option renderer}, and the
-             * {@linkplain Help#createDefaultParameterRenderer() default parameter renderer}. */</span>
+             * {@linkplain Help#createDefaultParameterRenderer() default parameter renderer}.
+             * @param colorScheme the color scheme to use for common, auto-generated parts of the usage help message */</span>
             <span class="directive">public</span> Layout(ColorScheme colorScheme) { <span class="local-variable">this</span>(colorScheme, <span class="keyword">new</span> TextTable()); }
 
             <span class="comment">/** Constructs a Layout with the specified color scheme, the specified TextTable, the
              * {@linkplain Help#createDefaultOptionRenderer() default option renderer}, and the
-             * {@linkplain Help#createDefaultParameterRenderer() default parameter renderer}. */</span>
+             * {@linkplain Help#createDefaultParameterRenderer() default parameter renderer}.
+             * @param colorScheme the color scheme to use for common, auto-generated parts of the usage help message
+             * @param textTable the TextTable to lay out parts of the usage help message in tabular format */</span>
             <span class="directive">public</span> Layout(ColorScheme colorScheme, TextTable textTable) {
                 <span class="local-variable">this</span>(colorScheme, textTable, <span class="keyword">new</span> DefaultOptionRenderer(), <span class="keyword">new</span> DefaultParameterRenderer());
             }
             <span class="comment">/** Constructs a Layout with the specified color scheme, the specified TextTable, the
-             * specified option renderer and the specified parameter renderer. */</span>
+             * specified option renderer and the specified parameter renderer.
+             * @param colorScheme the color scheme to use for common, auto-generated parts of the usage help message
+             * @param optionRenderer the object responsible for rendering Options to Text
+             * @param parameterRenderer the object responsible for rendering Parameters to Text
+             * @param textTable the TextTable to lay out parts of the usage help message in tabular format */</span>
             <span class="directive">public</span> Layout(ColorScheme colorScheme, TextTable textTable, IOptionRenderer optionRenderer, IParameterRenderer parameterRenderer) {
                 <span class="local-variable">this</span>.colorScheme       = Assert.notNull(colorScheme, <span class="string"><span class="delimiter">&quot;</span><span class="content">colorScheme</span><span class="delimiter">&quot;</span></span>);
                 <span class="local-variable">this</span>.table             = Assert.notNull(textTable, <span class="string"><span class="delimiter">&quot;</span><span class="content">textTable</span><span class="delimiter">&quot;</span></span>);
@@ -4831,7 +4904,7 @@ <h2 id="_download">18. Download</h2>
             }
             <span class="comment">/**
              * Copies the specified text values into the correct cells in the {@link TextTable}. This implementation
-             * delegates to {@link TextTable#addRowValues(Text...)} for each row of values.
+             * delegates to {@link TextTable#addRowValues(CommandLine.Help.Ansi.Text...)} for each row of values.
              * &lt;p&gt;Subclasses may override.&lt;/p&gt;
              * @param field the field annotated with the specified Option or Parameters
              * @param cellValues the text values representing the Option/Parameters, to be displayed in tabular form
@@ -4841,7 +4914,9 @@ <h2 id="_download">18. Download</h2>
                     table.addRowValues(oneRow);
                 }
             }
-            <span class="comment">/** Calls {@link #addOption(Field, CommandLine.Help.IParamLabelRenderer)} for all non-hidden Options in the list. */</span>
+            <span class="comment">/** Calls {@link #addOption(Field, CommandLine.Help.IParamLabelRenderer)} for all non-hidden Options in the list.
+             * @param fields fields annotated with {@link Option} to add usage descriptions for
+             * @param paramLabelRenderer object that knows how to render option parameters */</span>
             <span class="directive">public</span> <span class="type">void</span> addOptions(<span class="predefined-type">List</span>&lt;<span class="predefined-type">Field</span>&gt; fields, IParamLabelRenderer paramLabelRenderer) {
                 <span class="keyword">for</span> (<span class="predefined-type">Field</span> field : fields) {
                     <span class="predefined-type">Option</span> option = field.getAnnotation(<span class="predefined-type">Option</span>.class);
@@ -4852,7 +4927,7 @@ <h2 id="_download">18. Download</h2>
             }
             <span class="comment">/**
              * Delegates to the {@link #optionRenderer option renderer} of this layout to obtain
-             * text values for the specified {@link Option}, and then calls the {@link #layout(Field, Text[][])}
+             * text values for the specified {@link Option}, and then calls the {@link #layout(Field, CommandLine.Help.Ansi.Text[][])}
              * method to write these text values into the correct cells in the TextTable.
              * @param field the field annotated with the specified Option
              * @param paramLabelRenderer knows how to render option parameters
@@ -4862,7 +4937,9 @@ <h2 id="_download">18. Download</h2>
                 Text<span class="type">[]</span><span class="type">[]</span> values = optionRenderer.render(option, field, paramLabelRenderer, colorScheme);
                 layout(field, values);
             }
-            <span class="comment">/** Calls {@link #addPositionalParameter(Field, CommandLine.Help.IParamLabelRenderer)} for all non-hidden Parameters in the list. */</span>
+            <span class="comment">/** Calls {@link #addPositionalParameter(Field, CommandLine.Help.IParamLabelRenderer)} for all non-hidden Parameters in the list.
+             * @param fields fields annotated with {@link Parameters} to add usage descriptions for
+             * @param paramLabelRenderer knows how to render option parameters */</span>
             <span class="directive">public</span> <span class="type">void</span> addPositionalParameters(<span class="predefined-type">List</span>&lt;<span class="predefined-type">Field</span>&gt; fields, IParamLabelRenderer paramLabelRenderer) {
                 <span class="keyword">for</span> (<span class="predefined-type">Field</span> field : fields) {
                     Parameters parameters = field.getAnnotation(Parameters.class);
@@ -4874,7 +4951,7 @@ <h2 id="_download">18. Download</h2>
             <span class="comment">/**
              * Delegates to the {@link #parameterRenderer parameter renderer} of this layout
              * to obtain text values for the specified {@link Parameters}, and then calls
-             * {@link #layout(Field, Text[][])} to write these text values into the correct cells in the TextTable.
+             * {@link #layout(Field, CommandLine.Help.Ansi.Text[][])} to write these text values into the correct cells in the TextTable.
              * @param field the field annotated with the specified Parameters
              * @param paramLabelRenderer knows how to render option parameters
              */</span>
@@ -4969,15 +5046,20 @@ <h2 id="_download">18. Download</h2>
                     columns[i] = <span class="keyword">new</span> Column(columnWidths[i], <span class="integer">0</span>, i == columnWidths.length - <span class="integer">1</span> ? SPAN: WRAP);
                 }
             }
-            <span class="comment">/** Constructs a {@code TextTable} with the specified columns. */</span>
+            <span class="comment">/** Constructs a {@code TextTable} with the specified columns.
+             * @param columns columns to construct this TextTable with */</span>
             <span class="directive">public</span> TextTable(Column... columns) {
                 <span class="local-variable">this</span>.columns = Assert.notNull(columns, <span class="string"><span class="delimiter">&quot;</span><span class="content">columns</span><span class="delimiter">&quot;</span></span>);
                 <span class="keyword">if</span> (columns.length == <span class="integer">0</span>) { <span class="keyword">throw</span> <span class="keyword">new</span> <span class="exception">IllegalArgumentException</span>(<span class="string"><span class="delimiter">&quot;</span><span class="content">At least one column is required</span><span class="delimiter">&quot;</span></span>); }
             }
-            <span class="comment">/** Returns the {@code char[]} slot at the specified row and column to write a text value into. */</span>
+            <span class="comment">/** Returns the {@code Text} slot at the specified row and column to write a text value into.
+             * @param row the row of the cell whose Text to return
+             * @param col the column of the cell whose Text to return
+             * @return the Text object at the specified row and column */</span>
             <span class="directive">public</span> Text cellAt(<span class="type">int</span> row, <span class="type">int</span> col) { <span class="keyword">return</span> columnValues.get(col + (row * columns.length)); }
 
-            <span class="comment">/** Returns the current number of rows of this {@code TextTable}. */</span>
+            <span class="comment">/** Returns the current number of rows of this {@code TextTable}.
+             * @return the current number of rows in this TextTable */</span>
             <span class="directive">public</span> <span class="type">int</span> rowCount() { <span class="keyword">return</span> columnValues.size() / columns.length; }
 
             <span class="comment">/** Adds the required {@code char[]} slots for a new row to the {@link #columnValues} field. */</span>
@@ -4987,7 +5069,8 @@ <h2 id="_download">18. Download</h2>
                 }
             }
 
-            <span class="comment">/** Delegates to {@link #addRowValues(Text...)}. */</span>
+            <span class="comment">/** Delegates to {@link #addRowValues(CommandLine.Help.Ansi.Text...)}.
+             * @param values the text values to display in each column of the current row */</span>
             <span class="directive">public</span> <span class="type">void</span> addRowValues(<span class="predefined-type">String</span>... values) {
                 Text<span class="type">[]</span> array = <span class="keyword">new</span> Text[values.length];
                 <span class="keyword">for</span> (<span class="type">int</span> i = <span class="integer">0</span>; i &lt; array.length; i++) {
@@ -4997,7 +5080,7 @@ <h2 id="_download">18. Download</h2>
             }
             <span class="comment">/**
              * Adds a new {@linkplain TextTable#addEmptyRow() empty row}, then calls {@link
-             * TextTable#putValue(int, int, Text) putValue} for each of the specified values, adding more empty rows
+             * TextTable#putValue(int, int, CommandLine.Help.Ansi.Text) putValue} for each of the specified values, adding more empty rows
              * if the return value indicates that the value spanned multiple columns or was wrapped to multiple rows.
              * @param values the values to write into a new row in this TextTable
              * @throws IllegalArgumentException if the number of values exceeds the number of Columns in this table
@@ -5101,7 +5184,9 @@ <h2 id="_download">18. Download</h2>
                 <span class="keyword">return</span> length;
             }
 
-            <span class="comment">/** Copies the text representation that we built up from the options into the specified StringBuilder. */</span>
+            <span class="comment">/** Copies the text representation that we built up from the options into the specified StringBuilder.
+             * @param text the StringBuilder to write into
+             * @return the specified StringBuilder object (to allow method chaining and a more fluid API) */</span>
             <span class="directive">public</span> <span class="predefined-type">StringBuilder</span> toString(<span class="predefined-type">StringBuilder</span> text) {
                 <span class="type">int</span> columnCount = <span class="local-variable">this</span>.columns.length;
                 <span class="predefined-type">StringBuilder</span> row = <span class="keyword">new</span> <span class="predefined-type">StringBuilder</span>(<span class="integer">80</span>);
@@ -5157,21 +5242,37 @@ <h2 id="_download">18. Download</h2>
             <span class="directive">public</span> <span class="directive">final</span> <span class="predefined-type">List</span>&lt;IStyle&gt; optionStyles = <span class="keyword">new</span> <span class="predefined-type">ArrayList</span>&lt;IStyle&gt;();
             <span class="directive">public</span> <span class="directive">final</span> <span class="predefined-type">List</span>&lt;IStyle&gt; parameterStyles = <span class="keyword">new</span> <span class="predefined-type">ArrayList</span>&lt;IStyle&gt;();
             <span class="directive">public</span> <span class="directive">final</span> <span class="predefined-type">List</span>&lt;IStyle&gt; optionParamStyles = <span class="keyword">new</span> <span class="predefined-type">ArrayList</span>&lt;IStyle&gt;();
-            <span class="comment">/** Adds the specified styles to the styles for commands in this color scheme and returns this color scheme. */</span>
+            <span class="comment">/** Adds the specified styles to the registered styles for commands in this color scheme and returns this color scheme.
+             * @param styles the styles to add to the registered styles for commands in this color scheme
+             * @return this color scheme to enable method chaining for a more fluent API */</span>
             <span class="directive">public</span> ColorScheme commands(IStyle... styles)     { <span class="keyword">return</span> addAll(commandStyles, styles); }
-            <span class="comment">/** Adds the specified styles to the styles for options in this color scheme and returns this color scheme. */</span>
+            <span class="comment">/** Adds the specified styles to the registered styles for options in this color scheme and returns this color scheme.
+             * @param styles the styles to add to registered the styles for options in this color scheme
+             * @return this color scheme to enable method chaining for a more fluent API */</span>
             <span class="directive">public</span> ColorScheme options(IStyle... styles)      { <span class="keyword">return</span> addAll(optionStyles, styles);}
-            <span class="comment">/** Adds the specified styles to the styles for positional parameters in this color scheme and returns this color scheme. */</span>
+            <span class="comment">/** Adds the specified styles to the registered styles for positional parameters in this color scheme and returns this color scheme.
+             * @param styles the styles to add to registered the styles for parameters in this color scheme
+             * @return this color scheme to enable method chaining for a more fluent API */</span>
             <span class="directive">public</span> ColorScheme parameters(IStyle... styles)   { <span class="keyword">return</span> addAll(parameterStyles, styles);}
-            <span class="comment">/** Adds the specified styles to the styles for option parameters in this color scheme and returns this color scheme. */</span>
+            <span class="comment">/** Adds the specified styles to the registered styles for option parameters in this color scheme and returns this color scheme.
+             * @param styles the styles to add to the registered styles for option parameters in this color scheme
+             * @return this color scheme to enable method chaining for a more fluent API */</span>
             <span class="directive">public</span> ColorScheme optionParams(IStyle... styles) { <span class="keyword">return</span> addAll(optionParamStyles, styles);}
-            <span class="comment">/** Returns a Text with all command styles applied to the specified command string. */</span>
+            <span class="comment">/** Returns a Text with all command styles applied to the specified command string.
+             * @param command the command string to apply the registered command styles to
+             * @return a Text with all command styles applied to the specified command string */</span>
             <span class="directive">public</span> Ansi.Text commandText(<span class="predefined-type">String</span> command)         { <span class="keyword">return</span> Text.apply(command,     commandStyles); }
-            <span class="comment">/** Returns a Text with all option styles applied to the specified option string. */</span>
+            <span class="comment">/** Returns a Text with all option styles applied to the specified option string.
+             * @param option the option string to apply the registered option styles to
+             * @return a Text with all option styles applied to the specified option string */</span>
             <span class="directive">public</span> Ansi.Text optionText(<span class="predefined-type">String</span> option)           { <span class="keyword">return</span> Text.apply(option,      optionStyles); }
-            <span class="comment">/** Returns a Text with all parameter styles applied to the specified parameter string. */</span>
+            <span class="comment">/** Returns a Text with all parameter styles applied to the specified parameter string.
+             * @param parameter the parameter string to apply the registered parameter styles to
+             * @return a Text with all parameter styles applied to the specified parameter string */</span>
             <span class="directive">public</span> Ansi.Text parameterText(<span class="predefined-type">String</span> parameter)     { <span class="keyword">return</span> Text.apply(parameter,   parameterStyles); }
-            <span class="comment">/** Returns a Text with all optionParam styles applied to the specified optionParam string. */</span>
+            <span class="comment">/** Returns a Text with all optionParam styles applied to the specified optionParam string.
+             * @param optionParam the option parameter string to apply the registered option parameter styles to
+             * @return a Text with all option parameter styles applied to the specified option parameter string */</span>
             <span class="directive">public</span> Ansi.Text optionParamText(<span class="predefined-type">String</span> optionParam) { <span class="keyword">return</span> Text.apply(optionParam, optionParamStyles); }
 
             <span class="comment">/** Replaces colors and styles in this scheme with ones specified in system properties, and returns this scheme.
@@ -5230,8 +5331,9 @@ <h2 id="_download">18. Download</h2>
             <span class="directive">private</span> <span class="directive">static</span> <span class="type">boolean</span> ansiForcedOn()  { <span class="keyword">return</span> ansi != <span class="predefined-constant">null</span> &amp;&amp; ansi; }
             <span class="directive">private</span> <span class="directive">static</span> <span class="type">boolean</span> ansiForcedOff() { <span class="keyword">return</span> ansi != <span class="predefined-constant">null</span> &amp;&amp; !ansi; }
 
-            <span class="comment">/** Enabled if it is forced ON or if the platform supports ANSI escape codes and it is not forced OFF. */</span>
-            <span class="directive">public</span>  <span class="directive">static</span> <span class="type">boolean</span> enabled() { <span class="keyword">return</span> ansiForcedOn() || (ansiPossible() &amp;&amp; !ansiForcedOff()); }
+            <span class="comment">/** Enabled if it is forced ON or if the platform supports ANSI escape codes and it is not forced OFF.
+             * @return {@code true} if ANSI escape codes are enabled */</span>
+            <span class="directive">public</span> <span class="directive">static</span> <span class="type">boolean</span> enabled() { <span class="keyword">return</span> ansiForcedOn() || (ansiPossible() &amp;&amp; !ansiForcedOff()); }
 
             <span class="comment">/** Defines the interface for an ANSI escape sequence. */</span>
             <span class="directive">public</span> <span class="type">interface</span> <span class="class">IStyle</span> {
@@ -5239,10 +5341,12 @@ <h2 id="_download">18. Download</h2>
                 <span class="comment">/** The Control Sequence Introducer (CSI) escape sequence {@value}. */</span>
                 <span class="predefined-type">String</span> CSI = <span class="string"><span class="delimiter">&quot;</span><span class="char">\u001B</span><span class="content">[</span><span class="delimiter">&quot;</span></span>;
 
-                <span class="comment">/** Returns the ANSI escape code for turning this style on. */</span>
+                <span class="comment">/** Returns the ANSI escape code for turning this style on.
+                 * @return the ANSI escape code for turning this style on */</span>
                 <span class="predefined-type">String</span> on();
 
-                <span class="comment">/** Returns the ANSI escape code for turning this style off. */</span>
+                <span class="comment">/** Returns the ANSI escape code for turning this style off.
+                 * @return the ANSI escape code for turning this style off */</span>
                 <span class="predefined-type">String</span> off();
             }
 
@@ -5262,7 +5366,10 @@ <h2 id="_download">18. Download</h2>
                 <span class="predefined-type">Style</span>(<span class="type">int</span> startCode, <span class="type">int</span> endCode) {<span class="local-variable">this</span>.startCode = startCode; <span class="local-variable">this</span>.endCode = endCode; }
                 <span class="directive">public</span> <span class="predefined-type">String</span> on() { <span class="keyword">return</span> CSI + startCode + <span class="string"><span class="delimiter">&quot;</span><span class="content">m</span><span class="delimiter">&quot;</span></span>; }
                 <span class="directive">public</span> <span class="predefined-type">String</span> off() { <span class="keyword">return</span> CSI + endCode + <span class="string"><span class="delimiter">&quot;</span><span class="content">m</span><span class="delimiter">&quot;</span></span>; }
-                                <span class="comment">/** Returns the concatenated ANSI escape codes for turning all specified styles on. */</span>
+
+                                <span class="comment">/** Returns the concatenated ANSI escape codes for turning all specified styles on.
+                 * @param styles the styles to generate ANSI escape codes for
+                 * @return the concatenated ANSI escape codes for turning all specified styles on */</span>
                 <span class="directive">public</span> <span class="directive">static</span> <span class="predefined-type">String</span> on(IStyle... styles) {
                     <span class="predefined-type">StringBuilder</span> result = <span class="keyword">new</span> <span class="predefined-type">StringBuilder</span>();
                     <span class="keyword">for</span> (IStyle style : styles) {
@@ -5270,7 +5377,9 @@ <h2 id="_download">18. Download</h2>
                     }
                     <span class="keyword">return</span> result.toString();
                 }
-                                <span class="comment">/** Returns the concatenated ANSI escape codes for turning all specified styles off. */</span>
+                                <span class="comment">/** Returns the concatenated ANSI escape codes for turning all specified styles off.
+                 * @param styles the styles to generate ANSI escape codes for
+                 * @return the concatenated ANSI escape codes for turning all specified styles off */</span>
                 <span class="directive">public</span> <span class="directive">static</span> <span class="predefined-type">String</span> off(IStyle... styles) {
                     <span class="predefined-type">StringBuilder</span> result = <span class="keyword">new</span> <span class="predefined-type">StringBuilder</span>();
                     <span class="keyword">for</span> (IStyle style : styles) {
@@ -5280,25 +5389,27 @@ <h2 id="_download">18. Download</h2>
                 }
                                 <span class="comment">/** Parses the specified style markup and returns the associated style.
                                  *  The markup may be one of the Style enum value names, or it may be one of the Style enum value
-                                 *  names when {@code &quot;fg_&quot;} is prepended, or it may be an {@link java.awt.Color#decode(String) RGB Color int}.
-                                 * @param str the case-insensitive style markup to convert, e.g. {@code &quot;blue&quot;} or {@code &quot;fg_blue&quot;}
+                                 *  names when {@code &quot;fg_&quot;} is prepended, or it may be one of the indexed colors in the 256 color palette.
+                 * @param str the case-insensitive style markup to convert, e.g. {@code &quot;blue&quot;} or {@code &quot;fg_blue&quot;},
+                 *          or {@code &quot;46&quot;} (indexed color) or {@code &quot;0;5;0&quot;} (RGB components of an indexed color)
                                  * @return the IStyle for the specified converter
                                  */</span>
                 <span class="directive">public</span> <span class="directive">static</span> IStyle fg(<span class="predefined-type">String</span> str) {
                     <span class="keyword">try</span> { <span class="keyword">return</span> <span class="predefined-type">Style</span>.valueOf(str.toLowerCase(ENGLISH)); } <span class="keyword">catch</span> (<span class="exception">Exception</span> ignored) {}
                     <span class="keyword">try</span> { <span class="keyword">return</span> <span class="predefined-type">Style</span>.valueOf(<span class="string"><span class="delimiter">&quot;</span><span class="content">fg_</span><span class="delimiter">&quot;</span></span> + str.toLowerCase(ENGLISH)); } <span class="keyword">catch</span> (<span class="exception">Exception</span> ignored) {}
-                    <span class="keyword">return</span> <span class="keyword">new</span> ISO86133RGBColor(<span class="predefined-constant">true</span>, <span class="predefined-type">Color</span>.decode(str));
+                    <span class="keyword">return</span> <span class="keyword">new</span> Palette256Color(<span class="predefined-constant">true</span>, str);
                 }
                                 <span class="comment">/** Parses the specified style markup and returns the associated style.
                                  *  The markup may be one of the Style enum value names, or it may be one of the Style enum value
-                                 *  names when {@code &quot;bg_&quot;} is prepended, or it may be an {@link java.awt.Color#decode(String) RGB Color int}.
-                                 * @param str the case-insensitive style markup to convert, e.g. {@code &quot;blue&quot;} or {@code &quot;bg_blue&quot;}
+                                 *  names when {@code &quot;bg_&quot;} is prepended, or it may be one of the indexed colors in the 256 color palette.
+                                 * @param str the case-insensitive style markup to convert, e.g. {@code &quot;blue&quot;} or {@code &quot;bg_blue&quot;},
+                 *          or {@code &quot;46&quot;} (indexed color) or {@code &quot;0;5;0&quot;} (RGB components of an indexed color)
                                  * @return the IStyle for the specified converter
                                  */</span>
                 <span class="directive">public</span> <span class="directive">static</span> IStyle bg(<span class="predefined-type">String</span> str) {
                     <span class="keyword">try</span> { <span class="keyword">return</span> <span class="predefined-type">Style</span>.valueOf(str.toLowerCase(ENGLISH)); } <span class="keyword">catch</span> (<span class="exception">Exception</span> ignored) {}
                     <span class="keyword">try</span> { <span class="keyword">return</span> <span class="predefined-type">Style</span>.valueOf(<span class="string"><span class="delimiter">&quot;</span><span class="content">bg_</span><span class="delimiter">&quot;</span></span> + str.toLowerCase(ENGLISH)); } <span class="keyword">catch</span> (<span class="exception">Exception</span> ignored) {}
-                    <span class="keyword">return</span> <span class="keyword">new</span> ISO86133RGBColor(<span class="predefined-constant">false</span>, <span class="predefined-type">Color</span>.decode(str));
+                    <span class="keyword">return</span> <span class="keyword">new</span> Palette256Color(<span class="predefined-constant">false</span>, str);
                 }
                 <span class="comment">/** Parses the specified comma-separated sequence of style descriptors and returns the associated
                  *  styles. For each markup, strings starting with {@code &quot;bg(&quot;} are delegated to
@@ -5324,16 +5435,22 @@ <h2 id="_download">18. Download</h2>
                 }
             }
 
-            <span class="comment">/** ISO-8613-3 24-bit RGB color ansi escape codes. */</span>
-            <span class="directive">static</span> <span class="type">class</span> <span class="class">ISO86133RGBColor</span> <span class="directive">implements</span> IStyle {
+            <span class="comment">/** Defines a palette map of 216 colors: 6 * 6 * 6 cube (216 colors):
+             * 16 + 36 * r + 6 * g + b (0 &amp;lt;= r, g, b &amp;lt;= 5). */</span>
+            <span class="directive">static</span> <span class="type">class</span> <span class="class">Palette256Color</span> <span class="directive">implements</span> IStyle {
                 <span class="directive">private</span> <span class="directive">final</span> <span class="type">int</span> fgbg;
-                <span class="directive">private</span> <span class="directive">final</span> <span class="predefined-type">Color</span> color;
+                <span class="directive">private</span> <span class="directive">final</span> <span class="type">int</span> color;
 
-                ISO86133RGBColor(<span class="type">boolean</span> foreground, <span class="predefined-type">Color</span> color) {
+                Palette256Color(<span class="type">boolean</span> foreground, <span class="predefined-type">String</span> color) {
                     <span class="local-variable">this</span>.fgbg = foreground ? <span class="integer">38</span> : <span class="integer">48</span>;
-                    <span class="local-variable">this</span>.color = color;
+                    <span class="predefined-type">String</span><span class="type">[]</span> rgb = color.split(<span class="string"><span class="delimiter">&quot;</span><span class="content">;</span><span class="delimiter">&quot;</span></span>);
+                    <span class="keyword">if</span> (rgb.length == <span class="integer">3</span>) {
+                        <span class="local-variable">this</span>.color = <span class="integer">16</span> + <span class="integer">36</span> * <span class="predefined-type">Integer</span>.decode(rgb[<span class="integer">0</span>]) + <span class="integer">6</span> * <span class="predefined-type">Integer</span>.decode(rgb[<span class="integer">1</span>]) + <span class="predefined-type">Integer</span>.decode(rgb[<span class="integer">2</span>]);
+                    } <span class="keyword">else</span> {
+                        <span class="local-variable">this</span>.color = <span class="predefined-type">Integer</span>.decode(color);
+                    }
                 }
-                <span class="directive">public</span> <span class="predefined-type">String</span> on() { <span class="keyword">return</span> <span class="predefined-type">String</span>.format(CSI + <span class="string"><span class="delimiter">&quot;</span><span class="content">%d;2;%d;%d;%dm</span><span class="delimiter">&quot;</span></span>, fgbg, color.getRed(), color.getGreen(), color.getBlue()); }
+                <span class="directive">public</span> <span class="predefined-type">String</span> on() { <span class="keyword">return</span> <span class="predefined-type">String</span>.format(CSI + <span class="string"><span class="delimiter">&quot;</span><span class="content">%d;5;%dm</span><span class="delimiter">&quot;</span></span>, fgbg, color); }
                 <span class="directive">public</span> <span class="predefined-type">String</span> off() { <span class="keyword">return</span> CSI + (fgbg + <span class="integer">1</span>) + <span class="string"><span class="delimiter">&quot;</span><span class="content">m</span><span class="delimiter">&quot;</span></span>; }
             }
 
@@ -5347,7 +5464,8 @@ <h2 id="_download">18. Download</h2>
                 <span class="directive">private</span> <span class="predefined-type">StringBuilder</span> plain = <span class="keyword">new</span> <span class="predefined-type">StringBuilder</span>();
                 <span class="directive">private</span> <span class="predefined-type">SortedMap</span>&lt;<span class="predefined-type">Integer</span>, <span class="predefined-type">String</span>&gt; indexToStyle = <span class="keyword">new</span> <span class="predefined-type">TreeMap</span>&lt;<span class="predefined-type">Integer</span>, <span class="predefined-type">String</span>&gt;();
 
-                <span class="comment">/** Constructs a Text with the specified max length (for use in a TextTable Column). */</span>
+                <span class="comment">/** Constructs a Text with the specified max length (for use in a TextTable Column).
+                 * @param maxLength max length of this text */</span>
                 <span class="directive">public</span> Text(<span class="type">int</span> maxLength) { <span class="local-variable">this</span>.maxLength = maxLength; }
 
                 <span class="comment">/**
@@ -5406,22 +5524,33 @@ <h2 id="_download">18. Download</h2>
                     <span class="keyword">try</span> { <span class="keyword">return</span> <span class="local-variable">super</span>.clone(); } <span class="keyword">catch</span> (<span class="exception">CloneNotSupportedException</span> e) { <span class="keyword">throw</span> <span class="keyword">new</span> <span class="exception">IllegalStateException</span>(e); }
                 }
 
-                <span class="comment">/** Returns a new {@code Text} instance that is a substring of this Text. Does not modify this instance! */</span>
+                <span class="comment">/** Returns a new {@code Text} instance that is a substring of this Text. Does not modify this instance!
+                 * @param start index in the plain text where to start the substring
+                 * @return a new Text instance that is a substring of this Text */</span>
                 <span class="directive">public</span> Text substring(<span class="type">int</span> start) {
                     <span class="keyword">return</span> substring(start, length);
                 }
-                <span class="comment">/** Returns a new {@code Text} instance that is a substring of this Text. Does not modify this instance! */</span>
+
+                <span class="comment">/** Returns a new {@code Text} instance that is a substring of this Text. Does not modify this instance!
+                 * @param start index in the plain text where to start the substring
+                 * @param end index in the plain text where to end the substring
+                 * @return a new Text instance that is a substring of this Text */</span>
                 <span class="directive">public</span> Text substring(<span class="type">int</span> start, <span class="type">int</span> end) {
                     Text result = (Text) clone();
                     result.from = from + start;
                     result.length = end - start;
                     <span class="keyword">return</span> result;
                 }
-                <span class="comment">/** Returns a new {@code Text} instance with the specified text appended. Does not modify this instance! */</span>
+                <span class="comment">/** Returns a new {@code Text} instance with the specified text appended. Does not modify this instance!
+                 * @param string the text to append
+                 * @return a new Text instance */</span>
                 <span class="directive">public</span> Text append(<span class="predefined-type">String</span> string) {
                     <span class="keyword">return</span> append(<span class="keyword">new</span> Text(string));
                 }
-                <span class="comment">/** Returns a new {@code Text} instance with the specified text appended. Does not modify this instance! */</span>
+
+                <span class="comment">/** Returns a new {@code Text} instance with the specified text appended. Does not modify this instance!
+                 * @param other the text to append
+                 * @return a new Text instance */</span>
                 <span class="directive">public</span> Text append(Text other) {
                     Text result = (Text) clone();
                     result.plain = <span class="keyword">new</span> <span class="predefined-type">StringBuilder</span>(plain.toString().substring(from, from + length));
@@ -5462,14 +5591,16 @@ <h2 id="_download">18. Download</h2>
                     destination.plain.append(plain.toString().substring(from, from + length));
                     destination.length = destination.plain.length();
                 }
-                <span class="comment">/** Returns the plain text without any formatting */</span>
+                <span class="comment">/** Returns the plain text without any formatting.
+                 * @return the plain text without any formatting */</span>
                 <span class="directive">public</span> <span class="predefined-type">String</span> plainString() {  <span class="keyword">return</span> plain.toString().substring(from, from + length); }
 
                 <span class="directive">public</span> <span class="type">boolean</span> equals(<span class="predefined-type">Object</span> obj) { <span class="keyword">return</span> toString().equals(<span class="predefined-type">String</span>.valueOf(obj)); }
                 <span class="directive">public</span> <span class="type">int</span> hashCode() { <span class="keyword">return</span> toString().hashCode(); }
 
                 <span class="comment">/** Returns a String representation of the text with ANSI escape codes embedded, unless ANSI is
-                 * not {@linkplain CommandLine.Help.Ansi#enabled() enabled}, in which case the plain text is returned. */</span>
+                 * not {@linkplain CommandLine.Help.Ansi#enabled() enabled}, in which case the plain text is returned.
+                 * @return a String representation of the text with ANSI escape codes embedded (if enabled) */</span>
                 <span class="directive">public</span> <span class="predefined-type">String</span> toString() {
                     <span class="keyword">if</span> (!Ansi.enabled()) {
                         <span class="keyword">return</span> plain.toString().substring(from, from + length);
@@ -5637,8 +5768,8 @@ <h2 id="_download">18. Download</h2>
 </div>
 <div id="footer">
 <div id="footer-text">
-Version 0.9.4-SNAPSHOT<br>
-Last updated 2017-04-30 23:53:21 +09:00
+Version 0.9.4<br>
+Last updated 2017-05-04 10:49:05 +09:00
 </div>
 </div>
 </body>
diff --git a/src/main/java/picocli/CommandLine.java b/src/main/java/picocli/CommandLine.java
index a81aa89d5..bbe5769fc 100644
--- a/src/main/java/picocli/CommandLine.java
+++ b/src/main/java/picocli/CommandLine.java
@@ -118,7 +118,7 @@
  */
 public class CommandLine {
     /** This is picocli version {@value}. */
-    public static final String VERSION = "0.9.4-SNAPSHOT";
+    public static final String VERSION = "0.9.4";
 
     /** Set this field to {@code true} to force ANSI escape sequences on, or to {@code false} to force ANSI escape
      * sequences off. The default ({@code null}) is to enable ANSI escape sequences on supported platforms.  */
diff --git a/src/test/java/picocli/CommandLineTest.java b/src/test/java/picocli/CommandLineTest.java
index 0c1d8399d..ac73f0e2a 100644
--- a/src/test/java/picocli/CommandLineTest.java
+++ b/src/test/java/picocli/CommandLineTest.java
@@ -82,7 +82,7 @@
 public class CommandLineTest {
     @Test
     public void testVersion() {
-        assertEquals("0.9.4-SNAPSHOT", CommandLine.VERSION);
+        assertEquals("0.9.4", CommandLine.VERSION);
     }
 
     private static class SupportedTypes {

Modifier and Type	Method and Description
`static CommandLine.Arity`	CommandLine.Arity.`forOption(Field field)` - Returns a new `Arity` based on the Option annotation on the specified field, or the field type if no - arity was specified. -
`static CommandLine.Arity`	CommandLine.Arity.`forParameters(Field field)` - Returns a new `Arity` based on the Parameters annotation on the specified field, or the field type - if no arity was specified. -
`static CommandLine.Arity`	CommandLine.Arity.`forType(Class<?> type)` - Returns a new `Arity` based on the specified type: booleans have arity 0, arrays or Collections have - arity "0..*", and other types have arity 1. -
`static CommandLine.Arity`	CommandLine.Arity.`valueOf(String arity)` - Leniently parses the specified String as an `Arity` value and return the result. -
Modifier and Type	Field and Description
`List<CommandLine.Help.Ansi.IStyle>`	CommandLine.Help.ColorScheme.`commandStyles`
`List<CommandLine.Help.Ansi.IStyle>`	CommandLine.Help.ColorScheme.`optionParamStyles`
`List<CommandLine.Help.Ansi.IStyle>`	CommandLine.Help.ColorScheme.`optionStyles`
`List<CommandLine.Help.Ansi.IStyle>`	CommandLine.Help.ColorScheme.`parameterStyles`
Modifier and Type	Method and Description
`static CommandLine.Help.Ansi.IStyle`	CommandLine.Help.Ansi.Style.`bg(String str)` - Parses the specified style markup and returns the associated style. -
`static CommandLine.Help.Ansi.IStyle`	CommandLine.Help.Ansi.Style.`fg(String str)` - Parses the specified style markup and returns the associated style. -
`static CommandLine.Help.Ansi.IStyle[]`	CommandLine.Help.Ansi.Style.`parse(String commaSeparatedCodes)` - Parses the specified comma-separated sequence of style descriptors and returns the associated - styles. -
Modifier and Type	Method and Description
`CommandLine.Help.ColorScheme`	CommandLine.Help.ColorScheme.`commands(CommandLine.Help.Ansi.IStyle... styles)` - Adds the specified styles to the styles for commands in this color scheme and returns this color scheme. -
`static String`	CommandLine.Help.Ansi.Style.`off(CommandLine.Help.Ansi.IStyle... styles)` - Returns the concatenated ANSI escape codes for turning all specified styles off. -
`static String`	CommandLine.Help.Ansi.Style.`on(CommandLine.Help.Ansi.IStyle... styles)` - Returns the concatenated ANSI escape codes for turning all specified styles on. -
`CommandLine.Help.ColorScheme`	CommandLine.Help.ColorScheme.`optionParams(CommandLine.Help.Ansi.IStyle... styles)` - Adds the specified styles to the styles for option parameters in this color scheme and returns this color scheme. -
`CommandLine.Help.ColorScheme`	CommandLine.Help.ColorScheme.`options(CommandLine.Help.Ansi.IStyle... styles)` - Adds the specified styles to the styles for options in this color scheme and returns this color scheme. -
`CommandLine.Help.ColorScheme`	CommandLine.Help.ColorScheme.`parameters(CommandLine.Help.Ansi.IStyle... styles)` - Adds the specified styles to the styles for positional parameters in this color scheme and returns this color scheme. -
Modifier and Type	Method and Description
`static CommandLine.Help.Ansi.Text`	CommandLine.Help.Ansi.Text.`apply(String plainText, - List<CommandLine.Help.Ansi.IStyle> styles)` - Returns a new Text object where all the specified styles are applied to the full length of the - specified plain text. -
`CommandLine.Help.Ansi.Text`	CommandLine.Help.IParamLabelRenderer.`renderParameterLabel(Field field, - List<CommandLine.Help.Ansi.IStyle> styles)` - Returns a text rendering of the Option parameter or positional parameter; returns an empty string - `""` if the option is a boolean and does not take a parameter. -
Modifier and Type	Method and Description
`static CommandLine.Help.Ansi.Style`	CommandLine.Help.Ansi.Style.`valueOf(String name)` - Returns the enum constant of this type with the specified name. -
`static CommandLine.Help.Ansi.Style[]`	CommandLine.Help.Ansi.Style.`values()` - Returns an array containing the constants of this enum type, in -the order they are declared. -
Modifier and Type	Method and Description
`CommandLine.Help.Ansi.Text`	CommandLine.Help.Ansi.Text.`append(CommandLine.Help.Ansi.Text other)` - Returns a new `Text` instance with the specified text appended. -
`CommandLine.Help.Ansi.Text`	CommandLine.Help.Ansi.Text.`append(String string)` - Returns a new `Text` instance with the specified text appended. -
`static CommandLine.Help.Ansi.Text`	CommandLine.Help.Ansi.Text.`apply(String plainText, - List<CommandLine.Help.Ansi.IStyle> styles)` - Returns a new Text object where all the specified styles are applied to the full length of the - specified plain text. -
`CommandLine.Help.Ansi.Text`	CommandLine.Help.TextTable.`cellAt(int row, - int col)` - Returns the `char[]` slot at the specified row and column to write a text value into. -
`CommandLine.Help.Ansi.Text`	CommandLine.Help.ColorScheme.`commandText(String command)` - Returns a Text with all command styles applied to the specified command string. -
`CommandLine.Help.Ansi.Text`	CommandLine.Help.ColorScheme.`optionParamText(String optionParam)` - Returns a Text with all optionParam styles applied to the specified optionParam string. -
`CommandLine.Help.Ansi.Text`	CommandLine.Help.ColorScheme.`optionText(String option)` - Returns a Text with all option styles applied to the specified option string. -
`CommandLine.Help.Ansi.Text`	CommandLine.Help.ColorScheme.`parameterText(String parameter)` - Returns a Text with all parameter styles applied to the specified parameter string. -
`CommandLine.Help.Ansi.Text[][]`	CommandLine.Help.IOptionRenderer.`render(CommandLine.Option option, - Field field, - CommandLine.Help.IParamLabelRenderer parameterLabelRenderer, - CommandLine.Help.ColorScheme scheme)` - Returns a text representation of the specified Option and the Field that captures the option value. -
`CommandLine.Help.Ansi.Text[][]`	CommandLine.Help.IParameterRenderer.`render(CommandLine.Parameters parameters, - Field field, - CommandLine.Help.IParamLabelRenderer parameterLabelRenderer, - CommandLine.Help.ColorScheme scheme)` - Returns a text representation of the specified Parameters and the Field that captures the parameter values. -
`CommandLine.Help.Ansi.Text`	CommandLine.Help.IParamLabelRenderer.`renderParameterLabel(Field field, - List<CommandLine.Help.Ansi.IStyle> styles)` - Returns a text rendering of the Option parameter or positional parameter; returns an empty string - `""` if the option is a boolean and does not take a parameter. -
`CommandLine.Help.Ansi.Text`	CommandLine.Help.Ansi.Text.`substring(int start)` - Returns a new `Text` instance that is a substring of this Text. -
`CommandLine.Help.Ansi.Text`	CommandLine.Help.Ansi.Text.`substring(int start, - int end)` - Returns a new `Text` instance that is a substring of this Text. -
Modifier and Type	Method and Description
`void`	CommandLine.Help.TextTable.`addRowValues(CommandLine.Help.Ansi.Text... values)` - Adds a new empty row, then calls `putValue` for each of the specified values, adding more empty rows - if the return value indicates that the value spanned multiple columns or was wrapped to multiple rows. -
`CommandLine.Help.Ansi.Text`	CommandLine.Help.Ansi.Text.`append(CommandLine.Help.Ansi.Text other)` - Returns a new `Text` instance with the specified text appended. -
`void`	CommandLine.Help.Ansi.Text.`getStyledChars(int from, - int length, - CommandLine.Help.Ansi.Text destination, - int offset)` - Copies the specified substring of this Text into the specified destination, preserving the markup. -
`void`	CommandLine.Help.Layout.`layout(Field field, - CommandLine.Help.Ansi.Text[][] cellValues)` - Copies the specified text values into the correct cells in the `CommandLine.Help.TextTable`. -
`Point`	CommandLine.Help.TextTable.`putValue(int row, - int col, - CommandLine.Help.Ansi.Text value)` - Writes the specified value into the cell at the specified row and column and returns the last row and - column written to. -
Modifier and Type	Method and Description
`CommandLine.Help.ColorScheme`	CommandLine.Help.ColorScheme.`applySystemProperties()` - Replaces colors and styles in this scheme with ones specified in system properties, and returns this scheme. -
`CommandLine.Help.ColorScheme`	CommandLine.Help.ColorScheme.`commands(CommandLine.Help.Ansi.IStyle... styles)` - Adds the specified styles to the styles for commands in this color scheme and returns this color scheme. -
`static CommandLine.Help.ColorScheme`	CommandLine.Help.`defaultColorScheme()` - Creates and returns a new `CommandLine.Help.ColorScheme` initialized with picocli default values: commands are bold, - options and parameters use a yellow foreground, and option parameters use italic. -
`CommandLine.Help.ColorScheme`	CommandLine.Help.ColorScheme.`optionParams(CommandLine.Help.Ansi.IStyle... styles)` - Adds the specified styles to the styles for option parameters in this color scheme and returns this color scheme. -
`CommandLine.Help.ColorScheme`	CommandLine.Help.ColorScheme.`options(CommandLine.Help.Ansi.IStyle... styles)` - Adds the specified styles to the styles for options in this color scheme and returns this color scheme. -
`CommandLine.Help.ColorScheme`	CommandLine.Help.ColorScheme.`parameters(CommandLine.Help.Ansi.IStyle... styles)` - Adds the specified styles to the styles for positional parameters in this color scheme and returns this color scheme. -
Modifier and Type	Method and Description
`static CommandLine.Help.Column.Overflow`	CommandLine.Help.Column.Overflow.`valueOf(String name)` - Returns the enum constant of this type with the specified name. -
`static CommandLine.Help.Column.Overflow[]`	CommandLine.Help.Column.Overflow.`values()` - Returns an array containing the constants of this enum type, in -the order they are declared. -