Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityCommon/MacroStabilityIo/ConversionHelper.cs
===================================================================
diff -u -r3620 -r3634
--- DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityCommon/MacroStabilityIo/ConversionHelper.cs	(.../ConversionHelper.cs)	(revision 3620)
+++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityCommon/MacroStabilityIo/ConversionHelper.cs	(.../ConversionHelper.cs)	(revision 3634)
@@ -102,7 +102,7 @@
         /// <exception cref="System.ArgumentException"></exception>
         public static StabilityModelOptionType ConvertToModelOptions(MStabModelType mStabModelType)
         {
-            // For the MacroStability kernel, the only supported option for now is UpliftVan.
+            // For the Macrostability kernel, the only supported options for now are Bishop and UpliftVan.
             if (mStabModelType != MStabModelType.UpliftVan && mStabModelType != MStabModelType.Bishop)
             {
                 throw new ArgumentException(string.Format("Unsupported MStabModelType: {0}", mStabModelType));
@@ -121,13 +121,14 @@
         /// <exception cref="System.ArgumentException"></exception>
         public static StabilityModelOptionType ConvertToModelOptionsOutput(MStabModelType mStabModelType)
         {
-            // For the MacroStability kernel, the only supported option for now is UpliftVan.
-            if (mStabModelType != MStabModelType.UpliftVan)
+            // For the Macrostability kernel, the only supported options for now are Bishop and UpliftVan.
+            if (mStabModelType != MStabModelType.Bishop && mStabModelType != MStabModelType.UpliftVan)
             {
                 throw new ArgumentException(string.Format("Unsupported MStabModelType: {0}", mStabModelType));
             }
             var translationTable = new Dictionary<MStabModelType, StabilityModelOptionType>()
             {
+                {MStabModelType.Bishop, StabilityModelOptionType.Bishop},
                 {MStabModelType.UpliftVan, StabilityModelOptionType.UpliftVan}
             };
             return translationTable[mStabModelType];
Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/MacroStabilityCommon/ConversionHelperTests.cs
===================================================================
diff -u -r3620 -r3634
--- DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/MacroStabilityCommon/ConversionHelperTests.cs	(.../ConversionHelperTests.cs)	(revision 3620)
+++ DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/MacroStabilityCommon/ConversionHelperTests.cs	(.../ConversionHelperTests.cs)	(revision 3634)
@@ -86,6 +86,7 @@
         }
 
         [Test]
+        [TestCase(MStabModelType.Bishop, StabilityModelOptionType.Bishop)]
         [TestCase(MStabModelType.UpliftVan, StabilityModelOptionType.UpliftVan)]
         public void CanConvertToModelOptionsOutput(MStabModelType mStabModelType, StabilityModelOptionType modelOption)
         {
@@ -109,7 +110,6 @@
         }
 
         [ExpectedException(typeof(ArgumentException))]
-        [TestCase(MStabModelType.Bishop)]
         [TestCase(MStabModelType.UpliftSpencer)]
         [TestCase(MStabModelType.SpencerLow)]
         [TestCase(MStabModelType.SpencerHigh)]
Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityCommon/UpliftVanCalculationGrid.cs
===================================================================
diff -u -r3620 -r3634
--- DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityCommon/UpliftVanCalculationGrid.cs	(.../UpliftVanCalculationGrid.cs)	(revision 3620)
+++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityCommon/UpliftVanCalculationGrid.cs	(.../UpliftVanCalculationGrid.cs)	(revision 3634)
@@ -23,7 +23,7 @@
 
 namespace Deltares.DamEngine.Calculators.KernelWrappers.MacroStabilityCommon
 {
-    /// <summary>Parameters for the UpliftVan MacroStability kernel; used for IO</summary>
+    /// <summary>Parameters for the Uplift Van Macrostability kernel; used for IO</summary>
     public class UpliftVanCalculationGrid
     {
         /// <summary>Gets or sets the IsGridsAutomatic option.</summary>