diff --git a/src/Main.java b/src/Main.java
index 6d70ede..7fa7cf0 100644
--- a/src/Main.java
+++ b/src/Main.java
@@ -1,3 +1,6 @@
+import javax.swing.JOptionPane;
+import javax.swing.JTextField;
+
 import model.generator.MazeGenerator;
 import model.object.maze.Maze;
 import vue.HomeWindow;
@@ -8,9 +11,19 @@
  */
 
 public class Main {
-
     public static void main(String[] args) {
-        Maze maze = MazeGenerator.generate(10,15);
+    	JTextField boardWidth = new JTextField();
+    	JTextField boardHeight = new JTextField();
+    	Object[] message = {
+    	    "Board Width:", boardWidth,
+    	    "Board Height:", boardHeight
+    	};
+    	int option = JOptionPane.showConfirmDialog(null, message, "Setting maze size", JOptionPane.OK_CANCEL_OPTION);
+    	if (option != JOptionPane.OK_OPTION) {
+    	    boardWidth.setText("10");
+    	    boardHeight.setText("15");
+    	}
+        Maze maze = MazeGenerator.generate(Integer.parseInt(boardWidth.getText()),Integer.parseInt(boardHeight.getText()));
         HomeWindow homeWindow = new HomeWindow(maze);
         homeWindow.setVisible(true);
     }