Using ListOfSingleValueWriter instead of ArrayOfSingleValueWriter.

core/src/main/java/cucumber/runtime/table/TableConverter.java

@@ -7,7 +7,6 @@
 import cucumber.deps.com.thoughtworks.xstream.io.HierarchicalStreamReader;
 import cucumber.runtime.CucumberException;
 import cucumber.runtime.ParameterInfo;
-import cucumber.runtime.xstream.ArrayOfSingleValueWriter;
 import cucumber.runtime.xstream.CellWriter;
 import cucumber.runtime.xstream.ComplexTypeWriter;
 import cucumber.runtime.xstream.ListOfComplexTypeReader;
@@ -183,7 +182,7 @@ public DataTable toTable(List<?> objects, String... columnNames) {
            		} else if( object instanceof Map ) {
            			writer = new MapWriter(asList(columnNames));
            		} else if( object.getClass().isArray() ) {
-           			writer = new ArrayOfSingleValueWriter(asList(columnNames));
+           			writer = new ListOfSingleValueWriter(asList(columnNames));
            		} else {
            			writer = new ComplexTypeWriter(asList(columnNames));
            		}

core/src/main/java/cucumber/runtime/xstream/ListOfSingleValueWriter.java

@@ -7,13 +7,21 @@
 
 public class ListOfSingleValueWriter extends CellWriter {
     private int nodeDepth;
+    private final List<String> columnNames;
     private final List<String> values = new ArrayList<String>();
-
-    @Override
-    public List<String> getHeader() {
-        return null;
-    }
-
+
+    public ListOfSingleValueWriter() {
+    	columnNames = null;
+    }
+
+    public ListOfSingleValueWriter(List<String> columnNames) {
+        this.columnNames = columnNames;
+    }
+
+	@Override
+	public List<String> getHeader() {
+		return columnNames;
+	}
     @Override
     public List<String> getValues() {
         return values;

core/src/main/java/cucumber/runtime/xstream/MapWriter.java

@@ -7,8 +7,6 @@
 
 /**
  * Supports Map<String, Object> as the List item
- * 
- * @author Nicholas Albion
  */
 public class MapWriter extends CellWriter {
 	private String key;
@@ -22,7 +20,7 @@ public MapWriter(List<String> columnNames) {
 
 	@Override
 	public List<String> getHeader() {
-		return columnNames;
+		 return columnNames.isEmpty() ? new ArrayList<String>(values.keySet()) : columnNames;
 	}
 
 	@Override