2 files changed, 16 insertions, 1 deletions
diff --git a/Software/Visual_Studio/Tango.CSV/CsvFile.cs b/Software/Visual_Studio/Tango.CSV/CsvFile.cs
index f925c0017..9b1d23bb3 100644
--- a/Software/Visual_Studio/Tango.CSV/CsvFile.cs
+++ b/Software/Visual_Studio/Tango.CSV/CsvFile.cs
@@ -73,6 +73,18 @@ namespace Tango.CSV
         }
 
         /// <summary>
+        /// Gets the columns.
+        /// </summary>
+        /// <typeparam name="T"></typeparam>
+        /// <param name="csvSource">The CSV source.</param>
+        /// <returns></returns>
+        public static IEnumerable<string> GetColumns<T>(CsvSource csvSource) where T : new()
+        {
+            var csvFileReader = new CsvFileReader<T>(csvSource);
+            return csvFileReader.Columns;
+        }
+
+        /// <summary>
         /// Gets the field separator.
         /// </summary>
         /// <value>
@@ -94,7 +106,7 @@ namespace Tango.CSV
         /// <value>
         /// The columns.
         /// </value>
-        public IEnumerable<String> Columns { get; private set; }
+        public IEnumerable<String> Columns { get; protected set; }
 
         /// <summary>
         /// Performs application-defined tasks associated with freeing, releasing, or resetting unmanaged resources.
diff --git a/Software/Visual_Studio/Tango.CSV/CsvFileReader.cs b/Software/Visual_Studio/Tango.CSV/CsvFileReader.cs
index ec5b07630..79f716aab 100644
--- a/Software/Visual_Studio/Tango.CSV/CsvFileReader.cs
+++ b/Software/Visual_Studio/Tango.CSV/CsvFileReader.cs
@@ -35,6 +35,8 @@ namespace Tango.CSV
         private readonly char textQualifier;
         private readonly StringBuilder parseFieldResult = new StringBuilder();
 
+
+
         /// <summary>
         /// Initializes a new instance of the <see cref="CsvFileReader{T}"/> class.
         /// </summary>
@@ -420,6 +422,7 @@ namespace Tango.CSV
                     break;
             }
             this.columns = readColumns.ToArray();
+            Columns = this.columns;
         }
 
         /// <summary>