diff --git a/.gitignore b/.gitignore
index 8d02c3bc..953b181a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -16,6 +16,7 @@ build/*
 packages
 *.suo
 *.userprefs
+*.DotSettings.user
 *~
 \#*\#
 *.pidb
diff --git a/CommandLine4.sln.DotSettings.user b/CommandLine4.sln.DotSettings.user
deleted file mode 100644
index 3056baf2..00000000
--- a/CommandLine4.sln.DotSettings.user
+++ /dev/null
@@ -1,6 +0,0 @@
-<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
-	<s:Int64 x:Key="/Default/Housekeeping/UnitTestingMru/UnitTestSessionDefault/GroupingIndex/@EntryValue">4</s:Int64>
-	<s:Boolean x:Key="/Default/Housekeeping/UnitTestingMru/UnitTestSessionPersistentData/=C483843E824D41AC9911AB0FB04B6514/@KeyIndexDefined">True</s:Boolean>
-	<s:Int64 x:Key="/Default/Housekeeping/UnitTestingMru/UnitTestSessionPersistentData/=C483843E824D41AC9911AB0FB04B6514/GroupingIndex/@EntryValue">4</s:Int64>
-	<s:String x:Key="/Default/Housekeeping/UnitTestingMru/UnitTestSessionPersistentData/=C483843E824D41AC9911AB0FB04B6514/Name/@EntryValue">Session</s:String>
-	<s:String x:Key="/Default/Housekeeping/UnitTestingMru/UnitTestSessionPersistentData/=C483843E824D41AC9911AB0FB04B6514/XmlSerializedElements/@EntryValue">&lt;Session&gt;&lt;Elements&gt;&lt;UnitTestElement Provider="xUnit" Id="xunit:CommandLine.Tests.Unit.Text.HelpTextTests" type="XunitTestClassElement" projectId="0A15C4D2-B3E9-43AB-8155-1B39F7AC8A5E" typeName="CommandLine.Tests.Unit.Text.HelpTextTests" /&gt;&lt;UnitTestElement Provider="xUnit" Id="xunit:CommandLine.Tests.Unit.Core.InstanceBuilderTests" type="XunitTestClassElement" projectId="0A15C4D2-B3E9-43AB-8155-1B39F7AC8A5E" typeName="CommandLine.Tests.Unit.Core.InstanceBuilderTests" /&gt;&lt;UnitTestElement Provider="xUnit" Id="xunit:CommandLine.Tests.Unit.Core.InstanceChooserTests" type="XunitTestClassElement" projectId="0A15C4D2-B3E9-43AB-8155-1B39F7AC8A5E" typeName="CommandLine.Tests.Unit.Core.InstanceChooserTests" /&gt;&lt;UnitTestElement Provider="xUnit" Id="xunit:CommandLine.Tests.Unit.Core.OptionMapperTests" type="XunitTestClassElement" projectId="0A15C4D2-B3E9-43AB-8155-1B39F7AC8A5E" typeName="CommandLine.Tests.Unit.Core.OptionMapperTests" /&gt;&lt;UnitTestElement Provider="xUnit" Id="xunit:CommandLine.Tests.Unit.ParserTests" type="XunitTestClassElement" projectId="0A15C4D2-B3E9-43AB-8155-1B39F7AC8A5E" typeName="CommandLine.Tests.Unit.ParserTests" /&gt;&lt;UnitTestElement Provider="xUnit" Id="xunit:CommandLine.Tests.Unit.Core.TokenPartitionerTests" type="XunitTestClassElement" projectId="0A15C4D2-B3E9-43AB-8155-1B39F7AC8A5E" typeName="CommandLine.Tests.Unit.Core.TokenPartitionerTests" /&gt;&lt;UnitTestElement Provider="xUnit" Id="xunit:CommandLine.Tests.Unit.Text.HelpTextTests.Create_empty_instance" ParentId="xunit:CommandLine.Tests.Unit.Text.HelpTextTests" type="XunitTestMethodElement" projectId="0A15C4D2-B3E9-43AB-8155-1B39F7AC8A5E" typeName="CommandLine.Tests.Unit.Text.HelpTextTests" methodName="Create_empty_instance" skipReason="" /&gt;&lt;UnitTestElement Provider="xUnit" Id="xunit:CommandLine.Tests.Unit.Text.HelpTextTests.Create_instance_with_options" ParentId="xunit:CommandLine.Tests.Unit.Text.HelpTextTests" type="XunitTestMethodElement" projectId="0A15C4D2-B3E9-43AB-8155-1B39F7AC8A5E" typeName="CommandLine.Tests.Unit.Text.HelpTextTests" methodName="Create_instance_with_options" skipReason="" /&gt;&lt;UnitTestElement Provider="xUnit" Id="xunit:CommandLine.Tests.Unit.Text.HelpTextTests.Create_instance_without_options" ParentId="xunit:CommandLine.Tests.Unit.Text.HelpTextTests" type="XunitTestMethodElement" projectId="0A15C4D2-B3E9-43AB-8155-1B39F7AC8A5E" typeName="CommandLine.Tests.Unit.Text.HelpTextTests" methodName="Create_instance_without_options" skipReason="" /&gt;&lt;UnitTestElement Provider="xUnit" Id="xunit:CommandLine.Tests.Unit.Core.InstanceChooserTests.Explicit_help_request_for_a_valid_verb_generates_HelpVerbRequestedError_with_appropriate_data" ParentId="xunit:CommandLine.Tests.Unit.Core.InstanceChooserTests" type="XunitTestMethodElement" projectId="0A15C4D2-B3E9-43AB-8155-1B39F7AC8A5E" typeName="CommandLine.Tests.Unit.Core.InstanceChooserTests" methodName="Explicit_help_request_for_a_valid_verb_generates_HelpVerbRequestedError_with_appropriate_data" skipReason="" /&gt;&lt;UnitTestElement Provider="xUnit" Id="xunit:CommandLine.Tests.Unit.Core.InstanceChooserTests.Explicit_help_request_for_an_invalid_verb_generates_HelpVerbRequestedError_with_Matched_set_to_false" ParentId="xunit:CommandLine.Tests.Unit.Core.InstanceChooserTests" type="XunitTestMethodElement" projectId="0A15C4D2-B3E9-43AB-8155-1B39F7AC8A5E" typeName="CommandLine.Tests.Unit.Core.InstanceChooserTests" methodName="Explicit_help_request_for_an_invalid_verb_generates_HelpVerbRequestedError_with_Matched_set_to_false" skipReason="" /&gt;&lt;UnitTestElement Provider="xUnit" Id="xunit:CommandLine.Tests.Unit.Core.InstanceBuilderTests.Explicit_help_request_generates_help_requested_error" ParentId="xunit:CommandLine.Tests.Unit.Core.InstanceBuilderTests" type="XunitTestMethodElement" projectId="0A15C4D2-B3E9-43AB-8155-1B39F7AC8A5E" typeName="CommandLine.Tests.Unit.Core.InstanceBuilderTests" methodName="Explicit_help_request_generates_help_requested_error" skipReason="" /&gt;&lt;UnitTestElement Provider="xUnit" Id="xunit:CommandLine.Tests.Unit.Core.InstanceChooserTests.Explicit_help_request_generates_HelpVerbRequestedError" ParentId="xunit:CommandLine.Tests.Unit.Core.InstanceChooserTests" type="XunitTestMethodElement" projectId="0A15C4D2-B3E9-43AB-8155-1B39F7AC8A5E" typeName="CommandLine.Tests.Unit.Core.InstanceChooserTests" methodName="Explicit_help_request_generates_HelpVerbRequestedError" skipReason="" /&gt;&lt;UnitTestElement Provider="xUnit" Id="xunit:CommandLine.Tests.Unit.Text.HelpTextTests.Invoke_AutoBuild_for_Options_returns_appropriate_formatted_text" ParentId="xunit:CommandLine.Tests.Unit.Text.HelpTextTests" type="XunitTestMethodElement" projectId="0A15C4D2-B3E9-43AB-8155-1B39F7AC8A5E" typeName="CommandLine.Tests.Unit.Text.HelpTextTests" methodName="Invoke_AutoBuild_for_Options_returns_appropriate_formatted_text" skipReason="" /&gt;&lt;UnitTestElement Provider="xUnit" Id="xunit:CommandLine.Tests.Unit.Text.HelpTextTests.Invoke_AutoBuild_for_Verbs_with_specific_verb_returns_appropriate_formatted_text" ParentId="xunit:CommandLine.Tests.Unit.Text.HelpTextTests" type="XunitTestMethodElement" projectId="0A15C4D2-B3E9-43AB-8155-1B39F7AC8A5E" typeName="CommandLine.Tests.Unit.Text.HelpTextTests" methodName="Invoke_AutoBuild_for_Verbs_with_specific_verb_returns_appropriate_formatted_text" skipReason="" /&gt;&lt;UnitTestElement Provider="xUnit" Id="xunit:CommandLine.Tests.Unit.Text.HelpTextTests.Invoke_AutoBuild_for_Verbs_with_unknown_verb_returns_appropriate_formatted_text" ParentId="xunit:CommandLine.Tests.Unit.Text.HelpTextTests" type="XunitTestMethodElement" projectId="0A15C4D2-B3E9-43AB-8155-1B39F7AC8A5E" typeName="CommandLine.Tests.Unit.Text.HelpTextTests" methodName="Invoke_AutoBuild_for_Verbs_with_unknown_verb_returns_appropriate_formatted_text" skipReason="" /&gt;&lt;UnitTestElement Provider="xUnit" Id="xunit:CommandLine.Tests.Unit.Text.HelpTextTests.Invoking_RenderParsingErrorsText_returns_appropriate_formatted_text" ParentId="xunit:CommandLine.Tests.Unit.Text.HelpTextTests" type="XunitTestMethodElement" projectId="0A15C4D2-B3E9-43AB-8155-1B39F7AC8A5E" typeName="CommandLine.Tests.Unit.Text.HelpTextTests" methodName="Invoking_RenderParsingErrorsText_returns_appropriate_formatted_text" skipReason="" /&gt;&lt;UnitTestElement Provider="xUnit" Id="xunit:CommandLine.Tests.Unit.Text.HelpTextTests.Long_help_text_without_spaces" ParentId="xunit:CommandLine.Tests.Unit.Text.HelpTextTests" type="XunitTestMethodElement" projectId="0A15C4D2-B3E9-43AB-8155-1B39F7AC8A5E" typeName="CommandLine.Tests.Unit.Text.HelpTextTests" methodName="Long_help_text_without_spaces" skipReason="" /&gt;&lt;UnitTestElement Provider="xUnit" Id="xunit:CommandLine.Tests.Unit.Text.HelpTextTests.Long_pre_and_post_lines_without_spaces" ParentId="xunit:CommandLine.Tests.Unit.Text.HelpTextTests" type="XunitTestMethodElement" projectId="0A15C4D2-B3E9-43AB-8155-1B39F7AC8A5E" typeName="CommandLine.Tests.Unit.Text.HelpTextTests" methodName="Long_pre_and_post_lines_without_spaces" skipReason="" /&gt;&lt;UnitTestElement Provider="xUnit" Id="xunit:CommandLine.Tests.Unit.Core.OptionMapperTests.Map_boolean_switch_creates_boolean_value" ParentId="xunit:CommandLine.Tests.Unit.Core.OptionMapperTests" type="XunitTestMethodElement" projectId="0A15C4D2-B3E9-43AB-8155-1B39F7AC8A5E" typeName="CommandLine.Tests.Unit.Core.OptionMapperTests" methodName="Map_boolean_switch_creates_boolean_value" skipReason="" /&gt;&lt;UnitTestElement Provider="xUnit" Id="xunit:CommandLine.Tests.Unit.Core.InstanceBuilderTests.Omitting_required_option_gererates_MissingRequiredOptionError" ParentId="xunit:CommandLine.Tests.Unit.Core.InstanceBuilderTests" type="XunitTestMethodElement" projectId="0A15C4D2-B3E9-43AB-8155-1B39F7AC8A5E" typeName="CommandLine.Tests.Unit.Core.InstanceBuilderTests" methodName="Omitting_required_option_gererates_MissingRequiredOptionError" skipReason="" /&gt;&lt;UnitTestElement Provider="xUnit" Id="xunit:CommandLine.Tests.Unit.Core.InstanceBuilderTests.Parse_double_value" ParentId="xunit:CommandLine.Tests.Unit.Core.InstanceBuilderTests" type="XunitTestMethodElement" projectId="0A15C4D2-B3E9-43AB-8155-1B39F7AC8A5E" typeName="CommandLine.Tests.Unit.Core.InstanceBuilderTests" methodName="Parse_double_value" skipReason="" /&gt;&lt;UnitTestElement Provider="xUnit" Id="xunit:CommandLine.Tests.Unit.Core.InstanceChooserTests.Parse_empty_array_returns_NullInstance" ParentId="xunit:CommandLine.Tests.Unit.Core.InstanceChooserTests" type="XunitTestMethodElement" projectId="0A15C4D2-B3E9-43AB-8155-1B39F7AC8A5E" typeName="CommandLine.Tests.Unit.Core.InstanceChooserTests" methodName="Parse_empty_array_returns_NullInstance" skipReason="" /&gt;&lt;UnitTestElement Provider="xUnit" Id="xunit:CommandLine.Tests.Unit.Core.InstanceChooserTests.Parse_existing_verb_returns_verb_instance" ParentId="xunit:CommandLine.Tests.Unit.Core.InstanceChooserTests" type="XunitTestMethodElement" projectId="0A15C4D2-B3E9-43AB-8155-1B39F7AC8A5E" typeName="CommandLine.Tests.Unit.Core.InstanceChooserTests" methodName="Parse_existing_verb_returns_verb_instance" skipReason="" /&gt;&lt;UnitTestElement Provider="xUnit" Id="xunit:CommandLine.Tests.Unit.Core.InstanceBuilderTests.Parse_int_sequence_with_range" ParentId="xunit:CommandLine.Tests.Unit.Core.InstanceBuilderTests" type="XunitTestMethodElement" projectId="0A15C4D2-B3E9-43AB-8155-1B39F7AC8A5E" typeName="CommandLine.Tests.Unit.Core.InstanceBuilderTests" methodName="Parse_int_sequence_with_range" skipReason="" /&gt;&lt;UnitTestElement Provider="xUnit" Id="xunit:CommandLine.Tests.Unit.Core.InstanceBuilderTests.Parse_negative_double_value" ParentId="xunit:CommandLine.Tests.Unit.Core.InstanceBuilderTests" type="XunitTestMethodElement" projectId="0A15C4D2-B3E9-43AB-8155-1B39F7AC8A5E" typeName="CommandLine.Tests.Unit.Core.InstanceBuilderTests" methodName="Parse_negative_double_value" skipReason="" /&gt;&lt;UnitTestElement Provider="xUnit" Id="xunit:CommandLine.Tests.Unit.Core.InstanceBuilderTests.Parse_negative_int_value" ParentId="xunit:CommandLine.Tests.Unit.Core.InstanceBuilderTests" type="XunitTestMethodElement" projectId="0A15C4D2-B3E9-43AB-8155-1B39F7AC8A5E" typeName="CommandLine.Tests.Unit.Core.InstanceBuilderTests" methodName="Parse_negative_int_value" skipReason="" /&gt;&lt;UnitTestElement Provider="xUnit" Id="xunit:CommandLine.Tests.Unit.Core.InstanceBuilderTests.Parse_option_from_different_sets_gererates_MutuallyExclusiveSetError" ParentId="xunit:CommandLine.Tests.Unit.Core.InstanceBuilderTests" type="XunitTestMethodElement" projectId="0A15C4D2-B3E9-43AB-8155-1B39F7AC8A5E" typeName="CommandLine.Tests.Unit.Core.InstanceBuilderTests" methodName="Parse_option_from_different_sets_gererates_MutuallyExclusiveSetError" skipReason="" /&gt;&lt;UnitTestElement Provider="xUnit" Id="xunit:CommandLine.Tests.Unit.ParserTests.Parse_options" ParentId="xunit:CommandLine.Tests.Unit.ParserTests" type="XunitTestMethodElement" projectId="0A15C4D2-B3E9-43AB-8155-1B39F7AC8A5E" typeName="CommandLine.Tests.Unit.ParserTests" methodName="Parse_options" skipReason="" /&gt;&lt;UnitTestElement Provider="xUnit" Id="xunit:CommandLine.Tests.Unit.Core.InstanceBuilderTests.Parse_sequence_value_without_range_constraints" ParentId="xunit:CommandLine.Tests.Unit.Core.InstanceBuilderTests" type="XunitTestMethodElement" projectId="0A15C4D2-B3E9-43AB-8155-1B39F7AC8A5E" typeName="CommandLine.Tests.Unit.Core.InstanceBuilderTests" methodName="Parse_sequence_value_without_range_constraints" skipReason="" /&gt;&lt;UnitTestElement Provider="xUnit" Id="xunit:CommandLine.Tests.Unit.Core.InstanceBuilderTests.Parse_unknown_long_option_gererates_UnknownOptionError" ParentId="xunit:CommandLine.Tests.Unit.Core.InstanceBuilderTests" type="XunitTestMethodElement" projectId="0A15C4D2-B3E9-43AB-8155-1B39F7AC8A5E" typeName="CommandLine.Tests.Unit.Core.InstanceBuilderTests" methodName="Parse_unknown_long_option_gererates_UnknownOptionError" skipReason="" /&gt;&lt;UnitTestElement Provider="xUnit" Id="xunit:CommandLine.Tests.Unit.Core.InstanceBuilderTests.Parse_unknown_short_option_gererates_UnknownOptionError" ParentId="xunit:CommandLine.Tests.Unit.Core.InstanceBuilderTests" type="XunitTestMethodElement" projectId="0A15C4D2-B3E9-43AB-8155-1B39F7AC8A5E" typeName="CommandLine.Tests.Unit.Core.InstanceBuilderTests" methodName="Parse_unknown_short_option_gererates_UnknownOptionError" skipReason="" /&gt;&lt;UnitTestElement Provider="xUnit" Id="xunit:CommandLine.Tests.Unit.Core.InstanceBuilderTests.Parse_unknown_short_option_in_option_group_gererates_UnknownOptionError" ParentId="xunit:CommandLine.Tests.Unit.Core.InstanceBuilderTests" type="XunitTestMethodElement" projectId="0A15C4D2-B3E9-43AB-8155-1B39F7AC8A5E" typeName="CommandLine.Tests.Unit.Core.InstanceBuilderTests" methodName="Parse_unknown_short_option_in_option_group_gererates_UnknownOptionError" skipReason="" /&gt;&lt;UnitTestElement Provider="xUnit" Id="xunit:CommandLine.Tests.Unit.Core.InstanceBuilderTests.Parse_values_partitioned_between_sequence_and_scalar" ParentId="xunit:CommandLine.Tests.Unit.Core.InstanceBuilderTests" type="XunitTestMethodElement" projectId="0A15C4D2-B3E9-43AB-8155-1B39F7AC8A5E" typeName="CommandLine.Tests.Unit.Core.InstanceBuilderTests" methodName="Parse_values_partitioned_between_sequence_and_scalar" skipReason="" /&gt;&lt;UnitTestElement Provider="xUnit" Id="xunit:CommandLine.Tests.Unit.ParserTests.Parse_verbs" ParentId="xunit:CommandLine.Tests.Unit.ParserTests" type="XunitTestMethodElement" projectId="0A15C4D2-B3E9-43AB-8155-1B39F7AC8A5E" typeName="CommandLine.Tests.Unit.ParserTests" methodName="Parse_verbs" skipReason="" /&gt;&lt;UnitTestElement Provider="xUnit" Id="xunit:CommandLine.Tests.Unit.ParserTests.Parse_verbs_using_generic_overload" ParentId="xunit:CommandLine.Tests.Unit.ParserTests" type="XunitTestMethodElement" projectId="0A15C4D2-B3E9-43AB-8155-1B39F7AC8A5E" typeName="CommandLine.Tests.Unit.ParserTests" methodName="Parse_verbs_using_generic_overload" skipReason="" /&gt;&lt;UnitTestElement Provider="xUnit" Id="xunit:CommandLine.Tests.Unit.Core.TokenPartitionerTests.Partition_sequence_returns_sequence" ParentId="xunit:CommandLine.Tests.Unit.Core.TokenPartitionerTests" type="XunitTestMethodElement" projectId="0A15C4D2-B3E9-43AB-8155-1B39F7AC8A5E" typeName="CommandLine.Tests.Unit.Core.TokenPartitionerTests" methodName="Partition_sequence_returns_sequence" skipReason="" /&gt;&lt;UnitTestElement Provider="xUnit" Id="xunit:CommandLine.Tests.Unit.Text.HelpTextTests.When_defined_MetaValue_should_be_rendered" ParentId="xunit:CommandLine.Tests.Unit.Text.HelpTextTests" type="XunitTestMethodElement" projectId="0A15C4D2-B3E9-43AB-8155-1B39F7AC8A5E" typeName="CommandLine.Tests.Unit.Text.HelpTextTests" methodName="When_defined_MetaValue_should_be_rendered" skipReason="" /&gt;&lt;UnitTestElement Provider="xUnit" Id="xunit:CommandLine.Tests.Unit.Text.HelpTextTests.When_help_text_is_longer_than_width_it_will_wrap_around_as_if_in_a_column" ParentId="xunit:CommandLine.Tests.Unit.Text.HelpTextTests" type="XunitTestMethodElement" projectId="0A15C4D2-B3E9-43AB-8155-1B39F7AC8A5E" typeName="CommandLine.Tests.Unit.Text.HelpTextTests" methodName="When_help_text_is_longer_than_width_it_will_wrap_around_as_if_in_a_column" skipReason="" /&gt;&lt;UnitTestElement Provider="xUnit" Id="xunit:CommandLine.Tests.Unit.ParserTests.When_HelpWriter_is_set_help_screen_is_generated" ParentId="xunit:CommandLine.Tests.Unit.ParserTests" type="XunitTestMethodElement" projectId="0A15C4D2-B3E9-43AB-8155-1B39F7AC8A5E" typeName="CommandLine.Tests.Unit.ParserTests" methodName="When_HelpWriter_is_set_help_screen_is_generated" skipReason="" /&gt;&lt;UnitTestElement Provider="xUnit" Id="xunit:CommandLine.Tests.Unit.ParserTests.When_HelpWriter_is_set_help_screen_is_generated_in_verbs_scenario" ParentId="xunit:CommandLine.Tests.Unit.ParserTests" type="XunitTestMethodElement" projectId="0A15C4D2-B3E9-43AB-8155-1B39F7AC8A5E" typeName="CommandLine.Tests.Unit.ParserTests" methodName="When_HelpWriter_is_set_help_screen_is_generated_in_verbs_scenario" skipReason="" /&gt;&lt;UnitTestElement Provider="xUnit" Id="xunit:CommandLine.Tests.Unit.ParserTests.When_HelpWriter_is_set_help_screen_is_generated_in_verbs_scenario_using_generic_overload" ParentId="xunit:CommandLine.Tests.Unit.ParserTests" type="XunitTestMethodElement" projectId="0A15C4D2-B3E9-43AB-8155-1B39F7AC8A5E" typeName="CommandLine.Tests.Unit.ParserTests" methodName="When_HelpWriter_is_set_help_screen_is_generated_in_verbs_scenario_using_generic_overload" skipReason="" /&gt;&lt;UnitTestElement Provider="xUnit" Id="xunit:CommandLine.Tests.Unit.Core.InstanceBuilderTests.Wrong_range_in_sequence_gererates_SequenceOutOfRangeError" ParentId="xunit:CommandLine.Tests.Unit.Core.InstanceBuilderTests" type="XunitTestMethodElement" projectId="0A15C4D2-B3E9-43AB-8155-1B39F7AC8A5E" typeName="CommandLine.Tests.Unit.Core.InstanceBuilderTests" methodName="Wrong_range_in_sequence_gererates_SequenceOutOfRangeError" skipReason="" /&gt;&lt;/Elements&gt;&lt;/Session&gt;</s:String></wpf:ResourceDictionary>
\ No newline at end of file
diff --git a/src/CommandLine.Tests/CommandLine.Tests.csproj b/src/CommandLine.Tests/CommandLine.Tests.csproj
index 78783fd0..290fe047 100644
--- a/src/CommandLine.Tests/CommandLine.Tests.csproj
+++ b/src/CommandLine.Tests/CommandLine.Tests.csproj
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\..\packages\xunit.runner.visualstudio.2.0.0\build\net20\xunit.runner.visualstudio.props" Condition="Exists('..\..\packages\xunit.runner.visualstudio.2.0.0\build\net20\xunit.runner.visualstudio.props')" />
   <Import Project="..\..\packages\xunit.core.2.0.0\build\portable-net45+win+wpa81+wp80+monotouch+monoandroid+Xamarin.iOS\xunit.core.props" Condition="Exists('..\..\packages\xunit.core.2.0.0\build\portable-net45+win+wpa81+wp80+monotouch+monoandroid+Xamarin.iOS\xunit.core.props')" />
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
@@ -132,6 +133,7 @@
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
     <Error Condition="!Exists('..\..\packages\xunit.core.2.0.0\build\portable-net45+win+wpa81+wp80+monotouch+monoandroid+Xamarin.iOS\xunit.core.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\xunit.core.2.0.0\build\portable-net45+win+wpa81+wp80+monotouch+monoandroid+Xamarin.iOS\xunit.core.props'))" />
+    <Error Condition="!Exists('..\..\packages\xunit.runner.visualstudio.2.0.0\build\net20\xunit.runner.visualstudio.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\xunit.runner.visualstudio.2.0.0\build\net20\xunit.runner.visualstudio.props'))" />
   </Target>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/src/CommandLine.Tests/Fakes/HelpFakes.cs b/src/CommandLine.Tests/Fakes/HelpFakes.cs
index 85637ff3..009765a6 100644
--- a/src/CommandLine.Tests/Fakes/HelpFakes.cs
+++ b/src/CommandLine.Tests/Fakes/HelpFakes.cs
@@ -29,6 +29,27 @@ class FakeOptionsWithLongDescription
         public string FileName { get; set; }
     }
 
+    class FakeOptionsWithLongDescriptionAndNewLines
+    {
+        [Option('v', "verbose", HelpText = "This is the description of the verbosity to test out the wrapping capabilities of the Help Text.\n\nIn Addition to testing the insertion of line feeds.")]
+        public bool Verbose { get; set; }
+
+        [Option("input-file", HelpText = "This is a very long description of the Input File argument that gets passed in.  It should  be passed in as a string.\nThis tests a single line feed insertion.")]
+        public string FileName { get; set; }
+    }
+
+    class FakeOptionsWithLongDescriptionAndMixedNewLines
+    {
+        /// <summary>
+        /// HelpText string with a line feed character followed by a carriage return + line feed, should behave the same as 2 line feeds
+        /// </summary>
+        [Option('v', "verbose", HelpText = "This is the description of the verbosity to test out the wrapping capabilities of the Help Text.\n\r\nIn Addition to testing the insertion of line feeds.")]
+        public bool Verbose { get; set; }
+
+        [Option("input-file", HelpText = "This is a very long description of the Input File argument that gets passed in.  It should  be passed in as a string.\r\nThis tests a single line feed insertion.")]
+        public string FileName { get; set; }
+    }
+
     class FakeOptionsWithLongDescriptionAndNoSpaces
     {
         [Option('v', "verbose", HelpText = "Before 012345678901234567890123 After")]
diff --git a/src/CommandLine.Tests/Unit/Text/HelpTextTests.cs b/src/CommandLine.Tests/Unit/Text/HelpTextTests.cs
index 8852e342..3c8c16cf 100644
--- a/src/CommandLine.Tests/Unit/Text/HelpTextTests.cs
+++ b/src/CommandLine.Tests/Unit/Text/HelpTextTests.cs
@@ -143,6 +143,76 @@ public void When_help_text_is_longer_than_width_it_will_wrap_around_as_if_in_a_c
             // Teardown
         }
 
+        [Fact]
+        public void When_help_text_is_longer_than_width_it_will_wrap_around_as_if_in_a_column_with_new_lines()
+        {
+            // Fixture setup
+            // Exercize system 
+            var sut = new HelpText(new HeadingInfo("CommandLine.Tests.dll", "1.9.4.131"));
+            sut.MaximumDisplayWidth = 40;
+            sut.AddOptions(new FakeOptionsWithLongDescriptionAndNewLines());
+
+            // Verify outcome
+            var text = sut.ToString();
+            var lines = text.Split(new[] { Environment.NewLine }, StringSplitOptions.None);
+            lines[2].Should().Be("  v, verbose    This is the description"); //"The first line should have the arguments and the start of the Help Text.");
+            lines[3].Should().Be("                of the verbosity to ");
+            lines[4].Should().Be("                test out the wrapping ");
+            lines[5].Should().Be("                capabilities of the ");
+            // The following line ended as a result of the first line feed
+            lines[6].Should().Be("                Help Text.");
+            // The following empty line is the result of the second line feed
+            lines[7].Should().Be("                ");
+            lines[8].Should().Be("                In Addition to testing ");
+            lines[9].Should().Be("                the insertion of line ");
+            lines[10].Should().Be("                feeds.");
+            lines[11].Should().Be("  input-file    This is a very long ");
+            lines[12].Should().Be("                description of the ");
+            lines[13].Should().Be("                Input File argument ");
+            lines[14].Should().Be("                that gets passed in.  ");
+            lines[15].Should().Be("                It should  be passed in");
+            // The following line ended as a result of the lone line feed
+            lines[16].Should().Be("                as a string.");
+            lines[17].Should().Be("                This tests a single ");
+            lines[18].Should().Be("                line feed insertion.");
+            // Teardown
+        }
+
+        [Fact]
+        public void When_help_text_is_longer_than_width_it_will_wrap_around_as_if_in_a_column_with_mixed_new_line_styles()
+        {
+            // Fixture setup
+            // Exercize system 
+            var sut = new HelpText(new HeadingInfo("CommandLine.Tests.dll", "1.9.4.131"));
+            sut.MaximumDisplayWidth = 40;
+            sut.AddOptions(new FakeOptionsWithLongDescriptionAndMixedNewLines());
+
+            // Verify outcome
+            var text = sut.ToString();
+            var lines = text.Split(new[] { Environment.NewLine }, StringSplitOptions.None);
+            lines[2].Should().Be("  v, verbose    This is the description"); //"The first line should have the arguments and the start of the Help Text.");
+            lines[3].Should().Be("                of the verbosity to ");
+            lines[4].Should().Be("                test out the wrapping ");
+            lines[5].Should().Be("                capabilities of the ");
+            // The following line ended as a result of the line feed without a carriage return
+            lines[6].Should().Be("                Help Text.");
+            // The following empty line is the result of the carriage return + line feed
+            lines[7].Should().Be("                ");
+            lines[8].Should().Be("                In Addition to testing ");
+            lines[9].Should().Be("                the insertion of line ");
+            lines[10].Should().Be("                feeds.");
+            lines[11].Should().Be("  input-file    This is a very long ");
+            lines[12].Should().Be("                description of the ");
+            lines[13].Should().Be("                Input File argument ");
+            lines[14].Should().Be("                that gets passed in.  ");
+            lines[15].Should().Be("                It should  be passed in");
+            // The following line ended as a result of the lone carriage return + line feed
+            lines[16].Should().Be("                as a string.");
+            lines[17].Should().Be("                This tests a single ");
+            lines[18].Should().Be("                line feed insertion.");
+            // Teardown
+        }
+        
         [Fact]
         public void Long_help_text_without_spaces()
         {
diff --git a/src/CommandLine.Tests/packages.config b/src/CommandLine.Tests/packages.config
index f368b134..3f87c94b 100644
--- a/src/CommandLine.Tests/packages.config
+++ b/src/CommandLine.Tests/packages.config
@@ -7,4 +7,5 @@
   <package id="xunit.core" version="2.0.0" targetFramework="net45" />
   <package id="xunit.extensibility.core" version="2.0.0" targetFramework="net45" />
   <package id="xunit.extensions" version="2.0.0" targetFramework="net45" />
+  <package id="xunit.runner.visualstudio" version="2.0.0" targetFramework="net45" />
 </packages>
\ No newline at end of file
diff --git a/src/CommandLine/Text/HelpText.cs b/src/CommandLine/Text/HelpText.cs
index 91e0c771..176c92df 100644
--- a/src/CommandLine/Text/HelpText.cs
+++ b/src/CommandLine/Text/HelpText.cs
@@ -640,46 +640,65 @@ private HelpText AddOption(string requiredWord, int maxLength, OptionSpecificati
 
             if (!string.IsNullOrEmpty(optionHelpText))
             {
-                do
+                // This uses explicit \r\n and \n values instead of Environment.NewLine (that is either one or the other) to make HelpText creation easier for the developer 
+                var paragraphs = optionHelpText.Split(new[] { "\r\n", "\n" }, StringSplitOptions.None);
+                for (var p = 0; p < paragraphs.Length; p++)
                 {
-                    var wordBuffer = 0;
-                    var words = optionHelpText.Split(new[] { ' ' });
-                    for (var i = 0; i < words.Length; i++)
+                    var paragraph = paragraphs[p].Trim();
+
+                    if (paragraph.Length > 0)
                     {
-                        if (words[i].Length < (widthOfHelpText - wordBuffer))
+                        do
                         {
-                            this.optionsHelp.Append(words[i]);
-                            wordBuffer += words[i].Length;
-                            if ((widthOfHelpText - wordBuffer) > 1 && i != words.Length - 1)
+                            var wordBuffer = 0;
+                            var words = paragraph.Split(new[] { ' ' });
+                            for (var i = 0; i < words.Length; i++)
                             {
-                                this.optionsHelp.Append(" ");
-                                wordBuffer++;
+                                if (words[i].Length < (widthOfHelpText - wordBuffer))
+                                {
+                                    this.optionsHelp.Append(words[i]);
+                                    wordBuffer += words[i].Length;
+                                    if ((widthOfHelpText - wordBuffer) > 1 && i != words.Length - 1)
+                                    {
+                                        this.optionsHelp.Append(" ");
+                                        wordBuffer++;
+                                    }
+                                }
+                                else if (words[i].Length >= widthOfHelpText && wordBuffer == 0)
+                                {
+                                    this.optionsHelp.Append(words[i].Substring(0, widthOfHelpText));
+                                    wordBuffer = widthOfHelpText;
+                                    break;
+                                }
+                                else
+                                {
+                                    break;
+                                }
                             }
+
+                            paragraph = paragraph.Substring(
+                                Math.Min(wordBuffer, paragraph.Length)).Trim();
+                            if (paragraph.Length > 0)
+                            {
+                                this.optionsHelp.Append(Environment.NewLine);
+                                this.optionsHelp.Append(new string(' ', maxLength + 6));
+                            }
+                    
                         }
-                        else if (words[i].Length >= widthOfHelpText && wordBuffer == 0)
-                        {
-                            this.optionsHelp.Append(words[i].Substring(0, widthOfHelpText));
-                            wordBuffer = widthOfHelpText;
-                            break;
-                        }
-                        else
-                        {
-                            break;
-                        }
+                        while (paragraph.Length > widthOfHelpText);
+
+                        this.optionsHelp.Append(paragraph);
+
                     }
 
-                    optionHelpText = optionHelpText.Substring(
-                        Math.Min(wordBuffer, optionHelpText.Length)).Trim();
-                    if (optionHelpText.Length > 0)
+                    if (p < paragraphs.Length - 1)
                     {
                         this.optionsHelp.Append(Environment.NewLine);
                         this.optionsHelp.Append(new string(' ', maxLength + 6));
                     }
                 }
-                while (optionHelpText.Length > widthOfHelpText);
             }
 
-            this.optionsHelp.Append(optionHelpText);
             this.optionsHelp.Append(Environment.NewLine);
             if (this.additionalNewLineAfterOption)
             {