diff --git a/Documentation/Sif3Framework .NET Demo Usage Guide.doc b/Documentation/Sif3Framework .NET Demo Usage Guide.doc
index 2c2e8419..8d635bf4 100644
Binary files a/Documentation/Sif3Framework .NET Demo Usage Guide.doc and b/Documentation/Sif3Framework .NET Demo Usage Guide.doc differ
diff --git a/Scripts/BAT/Demo execution/DemoAuConsumer.bat b/Scripts/BAT/Demo execution/DemoAuConsumer.bat
index fb3053d3..52084c29 100644
--- a/Scripts/BAT/Demo execution/DemoAuConsumer.bat	
+++ b/Scripts/BAT/Demo execution/DemoAuConsumer.bat	
@@ -4,7 +4,7 @@ rem ============================================================================
 rem == User defined environment variables                                     ==
 rem ============================================================================
 
-set EXECUTABLE_PATH=..\..\..\Code\Sif3FrameworkDemo\Sif.Framework.Demo.Au.Consumer\bin\Debug\
+set EXECUTABLE_PATH=Code\Sif3FrameworkDemo\Sif.Framework.Demo.Au.Consumer\bin\Debug\
 set EXECUTABLE=Sif.Framework.Demo.Au.Consumer.exe
 
 echo EXECUTABLE=%EXECUTABLE_PATH%%EXECUTABLE%
@@ -13,6 +13,12 @@ rem ============================================================================
 rem == Safety checks                                                          ==
 rem ============================================================================
 
+if exist Code goto okWorkingDir
+echo Could not find 'Code\' directory (SCRIPT RUNS FROM top level of Sif3Framework-dotNet project)
+pause
+goto end
+:okWorkingDir
+
 if exist %EXECUTABLE_PATH%%EXECUTABLE% goto okExec
 echo Could not find : %EXECUTABLE_PATH%%EXECUTABLE%
 pause
diff --git a/Scripts/BAT/Demo execution/DemoAuSetup.bat b/Scripts/BAT/Demo execution/DemoAuSetup.bat
index b076fd17..8a021a21 100644
--- a/Scripts/BAT/Demo execution/DemoAuSetup.bat	
+++ b/Scripts/BAT/Demo execution/DemoAuSetup.bat	
@@ -4,7 +4,7 @@ rem ============================================================================
 rem == User defined environment variables                                     ==
 rem ============================================================================
 
-set EXECUTABLE_PATH=..\..\..\Code\Sif3FrameworkDemo\Sif.Framework.Demo.Setup\bin\Debug\
+set EXECUTABLE_PATH=Code\Sif3FrameworkDemo\Sif.Framework.Demo.Setup\bin\Debug\
 set EXECUTABLE=Sif.Framework.Demo.Setup.exe
 
 echo EXECUTABLE=%EXECUTABLE_PATH%%EXECUTABLE%
@@ -13,6 +13,12 @@ rem ============================================================================
 rem == Safety checks                                                          ==
 rem ============================================================================
 
+if exist Code goto okWorkingDir
+echo Could not find 'Code\' directory (SCRIPT RUNS FROM top level of Sif3Framework-dotNet project)
+pause
+goto end
+:okWorkingDir
+
 if exist %EXECUTABLE_PATH%%EXECUTABLE% goto okExec
 echo Could not find : %EXECUTABLE_PATH%%EXECUTABLE%
 pause
diff --git a/Scripts/BAT/Demo execution/DemoUsConsumer.bat b/Scripts/BAT/Demo execution/DemoUsConsumer.bat
index 504d278b..d12eb143 100644
--- a/Scripts/BAT/Demo execution/DemoUsConsumer.bat	
+++ b/Scripts/BAT/Demo execution/DemoUsConsumer.bat	
@@ -4,7 +4,7 @@ rem ============================================================================
 rem == User defined environment variables                                     ==
 rem ============================================================================
 
-set EXECUTABLE_PATH=..\..\..\Code\Sif3FrameworkDemo\Sif.Framework.Demo.Us.Consumer\bin\Debug\
+set EXECUTABLE_PATH=Code\Sif3FrameworkDemo\Sif.Framework.Demo.Us.Consumer\bin\Debug\
 set EXECUTABLE=Sif.Framework.Demo.Us.Consumer.exe
 
 echo EXECUTABLE=%EXECUTABLE_PATH%%EXECUTABLE%
@@ -13,6 +13,13 @@ rem ============================================================================
 rem == Safety checks                                                          ==
 rem ============================================================================
 
+if exist Code goto okWorkingDir
+echo Could not find 'Code\' directory (SCRIPT RUNS FROM top level of Sif3Framework-dotNet project)
+pause
+goto end
+:okWorkingDir
+
+
 if exist %EXECUTABLE_PATH%%EXECUTABLE% goto okExec
 echo Could not find : %EXECUTABLE_PATH%%EXECUTABLE%
 pause
diff --git a/Scripts/BAT/Demo execution/DemoUsSetup.bat b/Scripts/BAT/Demo execution/DemoUsSetup.bat
index 9481df3c..f4b1a6b0 100644
--- a/Scripts/BAT/Demo execution/DemoUsSetup.bat	
+++ b/Scripts/BAT/Demo execution/DemoUsSetup.bat	
@@ -4,7 +4,7 @@ rem ============================================================================
 rem == User defined environment variables                                     ==
 rem ============================================================================
 
-set EXECUTABLE_PATH=..\..\..\Code\Sif3FrameworkDemo\Sif.Framework.Demo.Setup\bin\Debug\
+set EXECUTABLE_PATH=Code\Sif3FrameworkDemo\Sif.Framework.Demo.Setup\bin\Debug\
 set EXECUTABLE=Sif.Framework.Demo.Setup.exe
 
 echo EXECUTABLE=%EXECUTABLE_PATH%%EXECUTABLE%
@@ -13,6 +13,12 @@ rem ============================================================================
 rem == Safety checks                                                          ==
 rem ============================================================================
 
+if exist Code goto okWorkingDir
+echo Could not find 'Code\' directory (SCRIPT RUNS FROM top level of Sif3Framework-dotNet project)
+pause
+goto end
+:okWorkingDir
+
 if exist %EXECUTABLE_PATH%%EXECUTABLE% goto okExec
 echo Could not find : %EXECUTABLE_PATH%%EXECUTABLE%
 pause
diff --git a/Visual Studio 2015 Note b/Visual Studio 2015 Note
new file mode 100644
index 00000000..74a49a69
--- /dev/null
+++ b/Visual Studio 2015 Note	
@@ -0,0 +1,19 @@
+
+If you try to open Sif3Framework.sln (as instructed in the Demo documentation)in Visual Studio 2015 
+(the project was create with VS 2013),you will get an error: 
+“This project is incompatible with the current version of Visual Studio”.
+
+To fix it, edit the file:
+
+Sif3Framework-dotNet/Code/Sif3Framework/Sif.Framework/Sif.Framework.csproj
+
+And change the ToolsVersion, ie,
+
+was:
+    <Project ToolsVersion="12.0" DefaultTargets="Build"
+     xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+should be:
+    <Project ToolsVersion="14.0" DefaultTargets="Build"
+     xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+    
+After that, the project works correctly.