diff --git a/Heat Pump Analysis.py b/Heat Pump Analysis.py
index ebf7f3f..8c63bfe 100644
--- a/Heat Pump Analysis.py	
+++ b/Heat Pump Analysis.py	
@@ -34,6 +34,8 @@
 # heat pump cooling
 
 # matplotlib figure plotting library
+import sys
+
 import matplotlib
 matplotlib.use("TkAgg")
 from matplotlib.backends.backend_tkagg import FigureCanvasTkAgg,NavigationToolbar2TkAgg
@@ -263,6 +265,9 @@
 a4.set_autoscaley_on(True)
 plt.grid(True)
 
+def quit():
+    exit(0)
+
 def popupmsg(title, msg):
     
     popup = tk.Tk()
diff --git a/setup_py2exe.py b/setup_py2exe.py
index ed6ee53..5f35d16 100644
--- a/setup_py2exe.py
+++ b/setup_py2exe.py
@@ -1,12 +1,16 @@
+import sys
+
+import glob
+
 from distutils.core import setup
 import py2exe
+import os
 
 # Remove the build folder, a bit slower but ensures that build contains the latest
 import shutil
 shutil.rmtree("build", ignore_errors=True)
 
-# my setup.py is based on one generated with gui2exe, so data_files is done a bit differently
-data_files = []
+matplot_lib_data_files = []
 includes = []
 excludes = ['_gtkagg', '_tkagg', 'bsddb', 'curses', 'pywin.debugger',
             'pywin.debugger.dbgcon', 'pywin.dialogs', 'tcl',
@@ -21,23 +25,15 @@
 
 # add the mpl mpl-data folder and rc file
 import matplotlib as mpl
-data_files += mpl.get_py2exe_datafiles()
-data_files += "./Cold Climate Air-Source Heat Pump Listing.txt"
-#data_files += "Climate Data/KBED-2002.txt"
-# data_files += "Climate Data/KBED-2003.txt"
-# data_files += "Climate Data/KBED-2004.txt"
-# data_files += "Climate Data/KBED-2005.txt"
-# data_files += "Climate Data/KBED-2006.txt"
-# data_files += "Climate Data/KBED-2007.txt"
-# data_files += "Climate Data/KBED-2008.txt"
-# data_files += "Climate Data/KBED-2009.txt"
-# data_files += "Climate Data/KBED-2010.txt"
-# data_files += "Climate Data/KBED-2011.txt"
-# data_files += "Climate Data/KBED-2012.txt"
-# data_files += "Climate Data/KBED-2013.txt"
-# data_files += "Climate Data/KBED-2014.txt"
-# data_files += "Climate Data/KBED-2015.txt"
-# data_files += "Residential Profiles/Default oil deliveries.txt"
+matplot_lib_data_files += mpl.get_py2exe_datafiles()
+
+
+f2 = ("", [r'./Cold Climate Air-Source Heat Pump Listing.txt'])
+matplot_lib_data_files.append(f2)
+
+matplot_lib_data_files.append(("Climate Data", glob.glob(r'.\Climate Data\*.*')))
+
+matplot_lib_data_files.append(("Residential Profiles", glob.glob(r'.\Residential Profiles\Default oil deliveries.txt')))
 
 setup(
     windows=[{"script" : "Heat Pump Analysis.py"}],
@@ -62,5 +58,5 @@
     # using zipfile to reduce number of files in dist
     zipfile = r'lib\library.zip',
 
-    data_files=data_files
+    data_files=matplot_lib_data_files
 )
\ No newline at end of file