diff --git a/buildConfig/RegionChooser.bat b/buildConfig/RegionChooser.bat
index 430ee7995efae8d4eb9422d91d568444d52ef8ca..e1e55cd163fd0e5c8d3597c21e6754588e28f22c 100644
--- a/buildConfig/RegionChooser.bat
+++ b/buildConfig/RegionChooser.bat
@@ -1,2 +1,14 @@
-java -classpath lib/* -Xms512m -Xmx2g -Djava.util.logging.config.file=logging.properties eu.simstadt.regionchooser.RegionChooserFX
-REM TODO: Update, similar to RegionChooser.sh
\ No newline at end of file
+@ECHO OFF
+REM Change code page in order to display UTF-8 symbols in Windows console
+chcp 65001 >nul
+cd /D "%~dp0"
+
+REM Example : RegionChooser.bat --input=%UserProfile%\Desktop\ManhattanSmall.gml --output=%UserProfile%\Desktop\out.gml --wkt=%UserProfile%\Desktop\polygon.wkt
+
+if "%~1" == "" (
+	ECHO No parameter, launching RegionChooser GUI 1>&2
+	java -classpath lib/*; eu.simstadt.regionchooser.RegionChooserFX
+) ELSE (
+	ECHO Launching RegionChooser CLI %* 1>&2
+	java -classpath lib/*; eu.simstadt.regionchooser.RegionChooserCLI %*
+)
\ No newline at end of file