2 files changed, 8 insertions, 1 deletions

diff --git a/README.md b/README.md
index 4bae53b..82cb645 100644
--- a/README.md
+++ b/README.md
@@ -55,10 +55,15 @@ See `java -jar ECTester.jar -h` for more.
  -o,--output <output_file>         Output into file <output_file>.
  -l,--log <log_file>               Log output into file [log_file].
  -v,--verbose                      Turn on verbose logging.
+    --format <format>              Output format to use.
  -f,--fresh                        Generate fresh keys (set domain
                                    parameters before every generation).
  -s,--simulate                     Simulate a card with jcardsim instead
                                    of using a terminal.
+ -y,--yes                          Accept all warnings and prompts.
+ -ka,--ka-type <type>              Set KeyAgreement object [type],
+                                   corresponds to JC.KeyAgreement
+                                   constants.   
 ```
 
 ### Actions
diff --git a/src/cz/crcs/ectester/reader/ECTester.java b/src/cz/crcs/ectester/reader/ECTester.java
index fa71ca6..413acae 100644
--- a/src/cz/crcs/ectester/reader/ECTester.java
+++ b/src/cz/crcs/ectester/reader/ECTester.java
@@ -232,11 +232,13 @@ public class ECTester {
          *
          * -i / --input <input_file>
          * -o / --output <output_file>
+         *      --format <format>
          * -l / --log [log_file]
          *
          * -f / --fresh
          * -s / --simulate
          * -y / --yes
+         * -ka/ --ka-type <type>
          */
         OptionGroup actions = new OptionGroup();
         actions.setRequired(true);
@@ -284,7 +286,7 @@ public class ECTester {
         opts.addOption(Option.builder("o").longOpt("output").desc("Output into file <output_file>.").hasArg().argName("output_file").build());
         opts.addOption(Option.builder("l").longOpt("log").desc("Log output into file [log_file].").hasArg().argName("log_file").optionalArg(true).build());
         opts.addOption(Option.builder("v").longOpt("verbose").desc("Turn on verbose logging.").build());
-        opts.addOption(Option.builder().longOpt("format").desc("Output format to use.").hasArg().argName("format").build());
+        opts.addOption(Option.builder().longOpt("format").desc("Output format to use. One of: text,yml,xml.").hasArg().argName("format").build());
 
         opts.addOption(Option.builder("f").longOpt("fresh").desc("Generate fresh keys (set domain parameters before every generation).").build());
         opts.addOption(Option.builder("s").longOpt("simulate").desc("Simulate a card with jcardsim instead of using a terminal.").build());