3 files changed, 15 insertions, 1 deletions

diff --git a/src/esieequest/Game.java b/src/esieequest/Game.java
index 925f067..a35cfb4 100644
--- a/src/esieequest/Game.java
+++ b/src/esieequest/Game.java
@@ -1,5 +1,7 @@
 package esieequest;
 
+import javax.swing.JApplet;
+
 /**
  * The game engine.
  * 
@@ -12,7 +14,7 @@ package esieequest;
  * 
  * @version February 2014
  */
-public class Game {
+public class Game extends JApplet {
         private UserInterface aGui;
         private GameEngine aEngine;
 
diff --git a/src/esieequest/GameEngine.java b/src/esieequest/GameEngine.java
index 3a89413..c20c70c 100644
--- a/src/esieequest/GameEngine.java
+++ b/src/esieequest/GameEngine.java
@@ -229,6 +229,7 @@ public class GameEngine {
         private void endGame() {
                 this.aGui.println("Thank you for playing. Good bye.");
                 this.aGui.enable(false);
+                this.aGui.killFrame();
         }
 
         /**
diff --git a/src/esieequest/UserInterface.java b/src/esieequest/UserInterface.java
index 4f3e19e..949348e 100644
--- a/src/esieequest/UserInterface.java
+++ b/src/esieequest/UserInterface.java
@@ -112,6 +112,12 @@ public class UserInterface implements ActionListener {
 
                 this.aEntryField.addActionListener(this);
 
+                this.aMyFrame.addWindowListener(new WindowAdapter() {
+                        public void windowClosing(WindowEvent e) {
+                                killFrame();
+                        }
+                });
+
                 this.aMyFrame.pack();
                 this.aMyFrame.setVisible(true);
                 this.aEntryField.requestFocus();
@@ -137,4 +143,9 @@ public class UserInterface implements ActionListener {
 
                 this.aEngine.interpretCommand(vInput);
         }
+
+        public void killFrame() {
+                this.aMyFrame.setVisible(false);
+                this.aMyFrame.dispose();
+        }
 }