Index: Core/Common/src/Core.Common.Gui/ExpandableArrayConverter.cs
===================================================================
diff -u -ra950714ad9510756331d862aa35695fa0b2ed03b -r05061cff6fc2d63d6be48e570153eb7909e01298
--- Core/Common/src/Core.Common.Gui/ExpandableArrayConverter.cs	(.../ExpandableArrayConverter.cs)	(revision a950714ad9510756331d862aa35695fa0b2ed03b)
+++ Core/Common/src/Core.Common.Gui/ExpandableArrayConverter.cs	(.../ExpandableArrayConverter.cs)	(revision 05061cff6fc2d63d6be48e570153eb7909e01298)
@@ -6,18 +6,78 @@
 namespace Core.Common.Gui
 {
     /// <summary>
-    /// <see cref="ArrayConverter"/> with modified conversion to string.
+    /// <see cref="ArrayConverter"/> with modified conversion to string and shows as array
+    /// starting with index 1 instead of 0.
     /// </summary>
     public class ExpandableArrayConverter : ArrayConverter
     {
         public override object ConvertTo(ITypeDescriptorContext context, CultureInfo culture, object value, Type destinationType)
         {
-            if (destinationType == typeof(string) && value is Array)
+            var array = value as Array;
+            if (destinationType == typeof(string) && array != null)
             {
-                return string.Format(Resources.ExpandableArrayConverter_ConvertTo_Aantal_0_, ((Array) value).Length);
+                return string.Format(Resources.ExpandableArrayConverter_ConvertTo_Aantal_0_, array.GetLength(0));
             }
 
             return base.ConvertTo(context, culture, value, destinationType);
         }
+
+        public override PropertyDescriptorCollection GetProperties(ITypeDescriptorContext context, object value, Attribute[] attributes)
+        {
+            PropertyDescriptor[] properties = null;
+            var array = value as Array;
+            if (array != null)
+            {
+                int length = array.GetLength(0);
+                properties = new PropertyDescriptor[length];
+
+                Type type = array.GetType();
+                Type elementType = type.GetElementType();
+                for (int index = 0; index < length; ++index)
+                {
+                    properties[index] = new ArrayPropertyDescriptor(type, elementType, index);
+                }
+            }
+            return new PropertyDescriptorCollection(properties);
+        }
+
+        #region Nested Type: ArrayPropertyDescriptor
+
+        /// <summary>
+        /// Array element property descriptor used by <see cref="ExpandableArrayConverter"/>.
+        /// Properties are named based on their index + 1.
+        /// </summary>
+        private class ArrayPropertyDescriptor : SimplePropertyDescriptor
+        {
+            private readonly int index;
+
+            /// <summary>
+            /// Initializes a new instance of the <see cref="ArrayPropertyDescriptor"/> class.
+            /// </summary>
+            /// <param name="arrayType">Type of the array.</param>
+            /// <param name="elementType">Type of the elements in <paramref name="arrayType"/>.</param>
+            /// <param name="elementIndex">Index of the element corresponding with this property descriptor.</param>
+            public ArrayPropertyDescriptor(Type arrayType, Type elementType, int elementIndex)
+                : base(arrayType, "[" + (elementIndex + 1) + "]", elementType, null)
+            {
+                index = elementIndex;
+            }
+
+            public override object GetValue(object instance)
+            {
+                var array = (Array)instance;
+                return array.GetValue(index);
+            }
+
+            public override void SetValue(object instance, object value)
+            {
+                var array = (Array)instance;
+                array.SetValue(value, index);
+                OnValueChanged(array, EventArgs.Empty); // This line is also available in the C# .Net version of this class
+            }
+        }
+
+        #endregion
+
     }
 }
\ No newline at end of file
Index: Core/Common/test/Core.Common.Gui.Test/Core.Common.Gui.Tests.csproj
===================================================================
diff -u -rcbb3c7e4f06665f1fc399e839bd0f370f8f13278 -r05061cff6fc2d63d6be48e570153eb7909e01298
--- Core/Common/test/Core.Common.Gui.Test/Core.Common.Gui.Tests.csproj	(.../Core.Common.Gui.Tests.csproj)	(revision cbb3c7e4f06665f1fc399e839bd0f370f8f13278)
+++ Core/Common/test/Core.Common.Gui.Test/Core.Common.Gui.Tests.csproj	(.../Core.Common.Gui.Tests.csproj)	(revision 05061cff6fc2d63d6be48e570153eb7909e01298)
@@ -15,7 +15,7 @@
     <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
     <IsCodedUITest>False</IsCodedUITest>
     <TestProjectType>UnitTest</TestProjectType>
-	<SignAssembly>false</SignAssembly>
+    <SignAssembly>false</SignAssembly>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
     <PlatformTarget>x86</PlatformTarget>
@@ -42,6 +42,7 @@
     <Reference Include="WindowsBase" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="ExpandableArrayConverterTest.cs" />
     <Compile Include="Forms\SplashScreenTest.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
@@ -54,7 +55,7 @@
       <Project>{D749EE4C-CE50-4C17-BF01-9A953028C126}</Project>
       <Name>Core.Common.TestUtils</Name>
     </ProjectReference>
-  </ItemGroup>  
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- 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.
Index: Core/Common/test/Core.Common.Gui.Test/ExpandableArrayConverterTest.cs
===================================================================
diff -u
--- Core/Common/test/Core.Common.Gui.Test/ExpandableArrayConverterTest.cs	(revision 0)
+++ Core/Common/test/Core.Common.Gui.Test/ExpandableArrayConverterTest.cs	(revision 05061cff6fc2d63d6be48e570153eb7909e01298)
@@ -0,0 +1,91 @@
+using System;
+using System.ComponentModel;
+
+using NUnit.Framework;
+
+namespace Core.Common.Gui.Tests
+{
+    [TestFixture]
+    public class ExpandableArrayConverterTest
+    {
+        [Test]
+        public void DefaultConstructor_ExpectedValues()
+        {
+            // Call
+            var converter = new ExpandableArrayConverter();
+
+            // Assert
+            Assert.IsInstanceOf<ArrayConverter>(converter);
+        }
+
+        [Test]
+        public void ConvertTo_ValueIsArrayObject_ReturnExpectedText()
+        {
+            // Setup
+            var array = new[]
+            {
+                1.1,
+                2.2,
+                3.3
+            };
+            var converter = new ExpandableArrayConverter();
+
+            // Call
+            var text = (string)converter.ConvertTo(null, null, array, typeof(string));
+
+            // Assert
+            Assert.AreEqual("Aantal (3)", text);
+        }
+
+        [Test]
+        public void ConvertTo_ValueIsNotAnArrayObject_ReturnTypeToString()
+        {
+            // Setup
+            var o = new object();
+            var converter = new ExpandableArrayConverter();
+
+            // Call
+            object text = converter.ConvertTo(null, null, o, typeof(string));
+
+            // Assert
+            Assert.AreEqual(o.ToString(), text);
+        }
+
+        [Test]
+        public void GetProperties_ValueIsArrayObject_ReturnPropertyDescriptorsForArryEntries()
+        {
+            // Setup
+            var array = new[]
+            {
+                1.1,
+                2.2,
+                3.3
+            };
+            var converter = new ExpandableArrayConverter();
+
+            // Call
+            PropertyDescriptorCollection properties = converter.GetProperties(null, array, new Attribute[0]);
+
+            // Assert
+            Assert.AreEqual(array.Length, properties.Count);
+            int valueChangedCallCount = 0;
+            for (int i = 0; i < array.Length; i++)
+            {
+                PropertyDescriptor propertyDescriptor = properties[i];
+
+                Assert.AreEqual(String.Format("[{0}]", i+1), propertyDescriptor.DisplayName);
+
+                Assert.AreEqual(array[i], propertyDescriptor.GetValue(array));
+
+                propertyDescriptor.AddValueChanged(array, delegate(object sender, EventArgs args)
+                {
+                    Assert.AreSame(array, sender);
+                    valueChangedCallCount++;
+                });
+                propertyDescriptor.SetValue(array, i);
+                Assert.AreEqual(i, array[i]);
+            }
+            Assert.AreEqual(array.Length, valueChangedCallCount);
+        }
+    }
+}
\ No newline at end of file