--- a/smalltalk.bat	Wed Jan 10 14:41:25 2018 +0100
+++ b/smalltalk.bat	Fri Jan 12 10:54:34 2018 +0100
@@ -53,13 +53,13 @@
 :: Versions =
 :: ==========
 :: This script
-SET batch_script_version=1.6.0
+SET batch_script_version=1.6.1
 :: Smalltalk/X
 SET stx_version_default=6.2.6
 :: Do not change following line, $STX_VERSION_DEFAULT serves
-::as placeholder and it's being replaced during installation
+:: as placeholder and it's being replaced during installation
 :: process (`rake install`)
-SET stx_version="!stx_version_default!"
+SET stx_version="%stx_version_default%"
 
 :: ====================
 :: Comments and style =
@@ -1718,6 +1718,7 @@
 ECHO    The error can be ignored.
 ECHO 5) The .lnk files are tested on Windows 7 SP1 (known to not work on Windows XP, you have to use the batch file directly.)
 ECHO 6) When using CMD PowerShell mode manual (user) switches can not be used.  When used the batch file forces CMD only mode.
+ECHO 7) The launcher can have issues with double-quotes and quotes within - escape them when needed - e.g. use double double quotes to escape
 ECHO:
 ECHO:
 ECHO:
@@ -1846,6 +1847,18 @@
 ECHO The %~nx0 executed is at version: "=>%~1<="
 ECHO:
 ECHO Smalltalk/X is at version: "=>%~2<="
+ECHO:
+ECHO The stx(-bin).com version output:
+IF EXIST "stx-bin.com" (
+    CALL stx-bin.com --version
+) ELSE IF EXIST "stx.com" (
+    CALL stx.com --version
+) ELSE (
+    ECHO "[WARN] The executable stx-bin.^(com^|exe^) or stx.^(com^|exe^) NOT found.""
+    ECHO "[WARN] Exiting with error. Script __numeric.exit_value: 1."
+    PAUSE
+    GOTO :EOF
+)
 
 GOTO :EOF