diff --git a/src/gam-setup.bat b/src/gam-setup.bat
index 9a52f300..52f220dc 100644
--- a/src/gam-setup.bat
+++ b/src/gam-setup.bat
@@ -68,5 +68,6 @@
 @goto saauth
 :sadone
 
-echo GAM installation and setup complete!
-:alldone
\ No newline at end of file
+@echo GAM installation and setup complete!
+:alldone
+@pause
\ No newline at end of file
diff --git a/src/gam.wxs b/src/gam.wxs
index 029534a6..2d59670e 100644
--- a/src/gam.wxs
+++ b/src/gam.wxs
@@ -52,6 +52,12 @@
       <Component Id="whatsnew_txt" Guid="6aa9863c-90d9-412f-9b73-fda82549a950">
         <File Name="whatsnew.txt" KeyPath="yes" />
       </Component>
+      <Component Id="gam_setup_bat" Guid="ef01f93a-4b50-488a-9c04-ec5e13e66218">
+        <File Name="gam-setup.bat" KeyPath="yes" />
+      </Component>
+      <Component Id="gamcommands_txt" Guid="58ff9c45-a7c9-4e22-8845-a9a92610c1f3">
+        <File Name="gamcommands.txt" KeyPath="yes" />
+      </Component>
     </ComponentGroup>
   </Fragment>
 
@@ -59,7 +65,10 @@
     <InstallUISequence>
       <ExecuteAction />
       <Show Dialog="WelcomeDlg" Before="ProgressDlg" />
-      <!-- <Show Dialog="ProgressDlg" After="" /> -->
     </InstallUISequence>
+    <CustomAction Id="setup_gam" ExeCommand="[INSTALLFOLDER]gam-setup.bat" Directory="INSTALLFOLDER" Execute="commit" Impersonate="yes" Return="asyncWait"/>
+    <InstallExecuteSequence>
+     <Custom Action="setup_gam" After="InstallFiles" >NOT Installed</Custom>
+    </InstallExecuteSequence>
   </Fragment>
 </Wix>
diff --git a/src/windows-build.bat b/src/windows-build.bat
index b33e8f07..1971485c 100644
--- a/src/windows-build.bat
+++ b/src/windows-build.bat
@@ -11,12 +11,16 @@ del /q /f gam.wixpdb
 c:\python27-32\scripts\pyinstaller --clean -F --distpath=gam windows-gam.spec
 xcopy LICENSE gam\
 xcopy whatsnew.txt gam\
+xcopy gam-setup.bat gam\
+xcopy gamcommands.txt gam\
 del gam\w9xpopen.exe
 "%ProgramFiles%\7-Zip\7z.exe" a -tzip gam-%1-windows.zip gam\ -xr!.svn
 
 c:\python27-64\scripts\pyinstaller --clean -F --distpath=gam-64 windows-gam.spec
 xcopy LICENSE gam-64\
 xcopy whatsnew.txt gam-64\
+xcopy gam-setup.bat gam-64\
+xcopy gamcommands.txt gam-64\
 "%ProgramFiles%\7-Zip\7z.exe" a -tzip gam-%1-windows-x64.zip gam-64\ -xr!.svn
 
 set GAMVERSION=%1