diff --git a/buildAll.cmd b/buildAll.cmd
index b7ded55..3a545e0 100755
--- a/buildAll.cmd
+++ b/buildAll.cmd
@@ -21,7 +21,7 @@ dotnet "../ElectronNet.CLI/bin/Debug/netcoreapp2.0/dotnet-electronize.dll" build
 echo "-- linux (dev-build)"
 dotnet "../ElectronNet.CLI/bin/Debug/netcoreapp2.0/dotnet-electronize.dll" build linux
 
-REM Be aware, that for non-electronnet-dev environemnts the correct 
+REM Be aware, that for non-electronnet-dev environments the correct 
 REM invoke command would be dotnet electronize ...
 
 REM Not supported on Windows Systems, because of SymLinks...
diff --git a/buildAll.sh b/buildAll.sh
index ff412c5..fc01b22 100755
--- a/buildAll.sh
+++ b/buildAll.sh
@@ -5,25 +5,28 @@ cd $dir/ElectronNET.API
 dotnet restore
 dotnet build
 cd ..
+
 echo "Restore & Build API"
 cd $dir/ElectronNET.CLI
 dotnet restore
 dotnet build
 cd ..
+
 echo "Restore & Build WebApp Demo"
 cd $dir/ElectronNET.WebApp
 dotnet restore
 dotnet build
+cd ..
 
 echo "Invoke electronize build in WebApp Demo"
 echo "-- win (dev-build)"
-dotnet $dir/ElectronNet.CLI/bin/Debug/netcoreapp2.0/dotnet-electronize.dll build win
+dotnet "$dir/ElectronNet.CLI/bin/Debug/netcoreapp2.0/dotnet-electronize.dll" build win
 
 echo "-- linux (dev-build)"
-dotnet $dir/ElectronNet.CLI/bin/Debug/netcoreapp2.0/dotnet-electronize.dll build linux
+dotnet "$dir/ElectronNet.CLI/bin/Debug/netcoreapp2.0/dotnet-electronize.dll" build linux
 
 echo "-- osx (dev-build)"
-dotnet $dir/ElectronNet.CLI/bin/Debug/netcoreapp2.0/dotnet-electronize.dll build osx
+dotnet "$dir/ElectronNet.CLI/bin/Debug/netcoreapp2.0/dotnet-electronize.dll" build osx
 
-# Be aware, that for non-electronnet-dev environemnts the correct 
+# Be aware, that for non-electronnet-dev environments the correct 
 # invoke command would be dotnet electronize ...
\ No newline at end of file