Merge branch 'pr/179' into 1.4.4

Author: caetera

MainClass.cs

@@ -63,15 +63,15 @@ private static void XicParametersParsing(string[] args)
                     "h|help", "Prints out the options.",
                     h => parameters.help = h != null
                 },
-                {
-                    "i=|input=", "The raw file input (Required). Specify this or an input directory -d",
-                    v => singleFile = v
-                },
                 {
                     "d=|input_directory=",
                     "The directory containing the raw files (Required). Specify this or an input file -i.",
                     v => fileDirectory = v
                 },
+                {
+                    "i=|input=", "The raw file input (Required). Specify this or an input directory -d",
+                    v => singleFile = v
+                },
                 {
                     "j=|json=",
                     "The json input file (Required).",
@@ -83,12 +83,12 @@ private static void XicParametersParsing(string[] args)
                     v => parameters.printJsonExample = v != null
                 },
                 {
-                    "o=|output=",
+                    "o=|output_directory=",
                     "The output directory. Specify this or an output file. Specifying neither writes to the input directory.",
                     v => outputDirectory = v
                 },
                 {
-                    "b=|output_file",
+                    "b=|output=",
                     "The output file. Specify this or an output directory. Specifying neither writes to the input directory.",
                     v => outputFile = v
                 },
@@ -103,7 +103,7 @@ private static void XicParametersParsing(string[] args)
                     v => parameters.stdout = v != null
                 },
                 {
-                  "w|warningsAreErrors", "Return non-zero exit code for warnings; default only for errors",
+                    "w|warningsAreErrors", "Return non-zero exit code for warnings; default only for errors",
                     v => parameters.Vigilant = v != null
                 },
                 {