diff --git a/Axel/src/de/hs_mannheim/informatik/spreadsheet/Spreadsheet.java b/Axel/src/de/hs_mannheim/informatik/spreadsheet/Spreadsheet.java
index de46be0..2de5c46 100644
--- a/Axel/src/de/hs_mannheim/informatik/spreadsheet/Spreadsheet.java
+++ b/Axel/src/de/hs_mannheim/informatik/spreadsheet/Spreadsheet.java
@@ -24,6 +24,17 @@ public class Spreadsheet {
 
 		// TODO limit the maximum size on 99 (1..99) rows and 26 (A..Z) columns
 
+		//limit maximum size
+		
+		if(rows>99) {
+			
+			rows=99;
+		}
+		
+		if(cols>26) {
+			cols=26;
+		}
+		
 		cells = new Cell[rows][cols];
 
 		for (int r = 0; r < rows; r++)