diff --git a/az b/az
new file mode 100755
index 00000000000..c4b5a8d6d7b
--- /dev/null
+++ b/az
@@ -0,0 +1,15 @@
+#!/bin/bash
+
+SOURCE="${BASH_SOURCE[0]}"
+while [ -h "$SOURCE" ]; do # resolve $SOURCE until the file is no longer a symlink
+  DIR="$( cd -P "$( dirname "$SOURCE" )" && pwd )"
+  SOURCE="$(readlink "$SOURCE")"
+  [[ $SOURCE != /* ]] && SOURCE="$DIR/$SOURCE" # if $SOURCE was a relative symlink, we need to resolve it relative to the path where the symlink file was located
+done
+DIR="$( cd -P "$( dirname "$SOURCE" )" && pwd )"
+
+export PYTHONPATH="${DIR}/src:${PYTHONPATH}"
+
+python -m azure.cli "$@"    
+
+
diff --git a/az.bat b/az.bat
new file mode 100644
index 00000000000..e8bf88e494e
--- /dev/null
+++ b/az.bat
@@ -0,0 +1,7 @@
+@echo off
+setlocal
+
+SET PYTHONPATH=%~dp0/src;%PYTHONPATH%
+python -m azure.cli %*
+
+endlocal
\ No newline at end of file