diff --git a/ClosedXML/ClosedXML/ClosedXML/Excel/XLWorksheet.cs b/ClosedXML/ClosedXML/ClosedXML/Excel/XLWorksheet.cs
index f4440a6..6f53b74 100644
--- a/ClosedXML/ClosedXML/ClosedXML/Excel/XLWorksheet.cs
+++ b/ClosedXML/ClosedXML/ClosedXML/Excel/XLWorksheet.cs
@@ -26,7 +26,6 @@
             RowNumber = 1;
             ColumnNumber = 1;
             ColumnLetter = "A";
-            //var tmp = this.Cell(1, 1).Value;
             this.Name = sheetName;
         }
 
@@ -62,13 +61,19 @@
         public List<IXLColumn> Columns()
         {
             var retVal = new List<IXLColumn>();
-            var usedColumns = Enumerable.Range(CellsCollection.Keys.Min(k => k.Column), CellsCollection.Keys.Max(k => k.Column));
-            var columnList = usedColumns.ToList();
-            columnList.AddRange(ColumnsCollection.Keys.Where(k => !usedColumns.Contains(k)).ToList());
+            var columnList = new List<Int32>();
+
+            if (CellsCollection.Count > 0)
+            columnList.AddRange(CellsCollection.Keys.Select(k => k.Column).Distinct());
+
+            if (ColumnsCollection.Count > 0)
+            columnList.AddRange(ColumnsCollection.Keys.Where(c => !columnList.Contains(c)));
+
             foreach (var c in columnList)
             {
                 retVal.Add(Column(c));
             }
+
             return retVal;
         }
 
diff --git a/ClosedXML/ClosedXML/ClosedXML_Examples/Program.cs b/ClosedXML/ClosedXML/ClosedXML_Examples/Program.cs
index d16c92a..1942617 100644
--- a/ClosedXML/ClosedXML/ClosedXML_Examples/Program.cs
+++ b/ClosedXML/ClosedXML/ClosedXML_Examples/Program.cs
@@ -13,15 +13,15 @@
     {
         static void Main(string[] args)
         {
-            //new HelloWorld().Create(@"c:\HelloWorld.xlsx");
-            //new BasicTable().Create(@"c:\BasicTable.xlsx");
-            //new StyleExamples().Create();
-            //new ColumnSettings().Create(@"c:\ColumnSettings.xlsx");
+            new HelloWorld().Create(@"c:\HelloWorld.xlsx");
+            new BasicTable().Create(@"c:\BasicTable.xlsx");
+            new StyleExamples().Create();
+            new ColumnSettings().Create(@"c:\ColumnSettings.xlsx");
             new RowSettings().Create(@"c:\RowSettings.xlsx");
-            //new MergeCells().Create(@"c:\MergedCells.xlsx");
-            //new InsertRows().Create(@"c:\InsertRows.xlsx");
-            //new InsertColumns().Create(@"c:\InsertColumns.xlsx");
-            //new ColumnCollection().Create(@"c:\ColumnCollection.xlsx");
+            new MergeCells().Create(@"c:\MergedCells.xlsx");
+            new InsertRows().Create(@"c:\InsertRows.xlsx");
+            new InsertColumns().Create(@"c:\InsertColumns.xlsx");
+            new ColumnCollection().Create(@"c:\ColumnCollection.xlsx");
         }
     }
 }
\ No newline at end of file
diff --git a/ClosedXML/ClosedXML/ClosedXML_Sandbox/Program.cs b/ClosedXML/ClosedXML/ClosedXML_Sandbox/Program.cs
index b0ff84b..2e66faa 100644
--- a/ClosedXML/ClosedXML/ClosedXML_Sandbox/Program.cs
+++ b/ClosedXML/ClosedXML/ClosedXML_Sandbox/Program.cs
@@ -27,6 +27,9 @@
                 c.Width = 20;
             }
 
+            // Fix Worksheet.Cells() method   !!!
+
+
 
 
             //foreach (var r in ws.Rows())