diff --git a/bin/elixir.bat b/bin/elixir.bat
index 0d4f5f62293..55c7ab9f21b 100644
--- a/bin/elixir.bat
+++ b/bin/elixir.bat
@@ -45,6 +45,9 @@ set originPath=%~dp0
 rem Optional parameters before the "-extra" parameter
 set beforeExtra=
 
+rem Flag which determines whether or not to use werl vs erl
+set useWerl=0
+
 rem Recursive loop called for each parameter that parses the cmd line parameters
 :startloop
 set par="%1"
@@ -57,6 +60,8 @@ if "%par%"=="""" (
   rem if no parameters defined - special case for parameter that is already quoted
   goto :expand_erl_libs
 )
+rem ******* EXECUTION OPTIONS **********************
+IF NOT "%par%"=="%par:+iex" (Set useWerl=1)
 rem ******* ERLANG PARAMETERS **********************
 IF NOT "%par%"=="%par:--detached=%" (Set parsErlang=%parsErlang% -detached) 
 IF NOT "%par%"=="%par:--hidden=%"   (Set parsErlang=%parsErlang% -hidden)
@@ -86,5 +91,8 @@ for  /d %%d in ("%originPath%..\lib\*.") do (
 )
 SETLOCAL disabledelayedexpansion
 :run
-erl %ext_libs% -noshell %ELIXIR_ERL_OPTS% %parsErlang% -s elixir start_cli %beforeExtra% -extra %*
-
+IF %useWerl% EQU 1 (
+    werl %ext_libs% -noshell %ELIXIR_ERL_OPTS% %parsErlang% -s elixir start_cli %beforeExtra% -extra %*
+) ELSE (
+    erl %ext_libs% -noshell %ELIXIR_ERL_OPTS% %parsErlang% -s elixir start_cli %beforeExtra% -extra %*
+)
\ No newline at end of file
diff --git a/bin/iex.bat b/bin/iex.bat
index 7e528c538d4..5abfe00ca68 100644
--- a/bin/iex.bat
+++ b/bin/iex.bat
@@ -1,2 +1,2 @@
 @echo off
-call "%~dp0\elixir.bat" +iex --no-halt -e "IEx.start" %*
\ No newline at end of file
+call "%~dp0\elixir.bat" +iex --erl "-user Elixir.IEx.CLI" --no-halt %
\ No newline at end of file