diff --git a/Mustang-CLI/src/main/java/org/mustangproject/commandline/Main.java b/Mustang-CLI/src/main/java/org/mustangproject/commandline/Main.java
index 987c8cc0e..46a24899f 100755
--- a/Mustang-CLI/src/main/java/org/mustangproject/commandline/Main.java
+++ b/Mustang-CLI/src/main/java/org/mustangproject/commandline/Main.java
@@ -47,21 +47,23 @@ private static void printUsage() {
 
 	private static String getUsage() {
 		return "Usage: --action metrics|combine|extract|a3only|validate|visualize [-d,--directory] [-l,--listfromstdin] [-i,--ignore fileextension, PDF/A errors] | [-h,--help] \r\n"
-				+ "* merics\n" + "        -d, --directory count ZUGFeRD files in directory to be scanned\n"
+				+ "        --action=metrics\n"
+				+
+				+ "          -d, --directory count ZUGFeRD files in directory to be scanned\n"
 				+ "                If it is a directory, it will recurse.\n"
-				+ "        -l, --listfromstdin     count ZUGFeRD files from a list of linefeed separated files on runtime.\n"
+				+ "          -l, --listfromstdin     count ZUGFeRD files from a list of linefeed separated files on runtime.\n"
 				+ "                It will start once a blank line has been entered.\n" + "\n"
 				+ "        Additional parameter for both count operations\n"
 				+ "        [-i, --ignorefileextension]     Check for all files (*.*) instead of PDF files only (*.pdf) in metrics, ignore PDF/A input file errors in combine\n"
-				+ "\n" + "* Merge actions\n" + "        extract   extract ZUGFeRD PDF to XML file\n"
+				+ "        --action=extract   extract ZUGFeRD PDF to XML file\n"
 				+ "                Additional parameters (optional - user will be prompted if not defined)\n"
 				+ "                [--source=<filename>]: set input PDF file\n"
 				+ "                [--out=<filename>]: set output XML file\n"
-				+ "        a3only    upgrade from PDF/A1 to A3 only (no ZUGFeRD data attached)\n"
+				+ "        --action=a3only    upgrade from PDF/A1 to A3 only (no ZUGFeRD data attached)\n"
 				+ "                Additional parameters (optional - user will be prompted if not defined)\n"
 				+ "                [--source=<filename>]: set input PDF file\n"
 				+ "                [--out=<filename>]: set output PDF file\n"
-				+ "        combine   combine XML and PDF file to ZUGFeRD PDF file\n"
+				+ "        --action=combine   combine XML and PDF file to ZUGFeRD PDF file\n"
 				+ "                Additional parameters (optional - user will be prompted if not defined)\n"
 				+ "                [--source=<filename>]: set input PDF file\n"
 				+ "                [--source-xml=<filename>]: set input XML file\n"
@@ -70,25 +72,25 @@ private static String getUsage() {
 				+ "                [--version <1|2>]: set ZUGFeRD version\n"
 				+ "                [--profile <...>]: set ZUGFeRD profile\n"
 				+ "                        For ZUGFeRD v1: <B>ASIC, <C>OMFORT or EX<T>ENDED\n"
-				+ "                        For ZUGFeRD v2: <M>INIMUM, BASIC <W>L, <B>ASIC, <C>IUS, <E>N16931, <X>Rechnung, EX<T>ENDED "
-				+ "        upgrade   upgrade ZUGFeRD XML to ZUGFeRD 2 XML\n"
+				+ "                        For ZUGFeRD v2: <M>INIMUM, BASIC <W>L, <B>ASIC, <C>IUS, <E>N16931, <X>Rechnung, EX<T>ENDED \n"
+				+ "        --action=upgrade   upgrade ZUGFeRD XML to ZUGFeRD 2 XML\n"
 				+ "                Additional parameters (optional - user will be prompted if not defined)\n"
 				+ "                [--source <filename>]: set input XML ZUGFeRD 1 file\n"
 				+ "                [--out <filename>]: set output XML ZUGFeRD 2 file\n"
-				+ "        validate  validate XML or PDF file \n"
+				+ "        --action=validate  validate XML or PDF file \n"
 				+ "                [--no-notices]: refrain from reporting notices\n"
 				+ "                [--logAppend=<text>]: text to be added to log line\n"
 				+ "                Additional parameters (optional - user will be prompted if not defined)\n"
 				+ "                [--source=<filename>]: input PDF or XML file\n"
-				+ "        validateExpectValid  validate directory expecting positive results \n"
+				+ "        --action=validateExpectValid  validate directory expecting positive results \n"
 				+ "                [--no-notices]: refrain from reporting notices\n"
 				+ "                Additional parameters (optional - user will be prompted if not defined)\n"
 				+ "					-d, --directory to check recursively \n"
-				+ "        validateExpectInvalid  validate directory expecting negative results \n"
+				+ "        --action=validateExpectInvalid  validate directory expecting negative results \n"
 				+ "                [--no-notices]: refrain from reporting notices\n"
 				+ "                Additional parameters (optional - user will be prompted if not defined)\n"
 				+ "					-d, --directory to check recursively\n"
-				+ "        visualize  convert XML to HTML \n"
+				+ "        --action=visualize  convert XML to HTML \n"
 				;
 	}