diff --git a/Source/MQTTnet.Server/MQTTnet.Server.csproj b/Source/MQTTnet.Server/MQTTnet.Server.csproj
index 0b081af8..a95c5bfd 100644
--- a/Source/MQTTnet.Server/MQTTnet.Server.csproj
+++ b/Source/MQTTnet.Server/MQTTnet.Server.csproj
@@ -29,13 +29,6 @@
     <NoWarn>1701;1702</NoWarn>
   </PropertyGroup>
 
-  <ItemGroup>
-    <Compile Remove="wwwroot\**" />
-    <Content Remove="wwwroot\**" />
-    <EmbeddedResource Remove="wwwroot\**" />
-    <None Remove="wwwroot\**" />
-  </ItemGroup>
-
   <ItemGroup>
     <Content Update="appsettings.json">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
@@ -72,11 +65,13 @@
     <None Update="Web\authorization_handler.py">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
+    <None Update="Web\wwwroot\Hello.txt">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
   </ItemGroup>
 
   <ItemGroup>
     <Folder Include="Properties\PublishProfiles\" />
-    <Folder Include="Web\wwwroot\" />
   </ItemGroup>
 
 </Project>
diff --git a/Source/MQTTnet.Server/Program.cs b/Source/MQTTnet.Server/Program.cs
index 571df2bf..093c6072 100644
--- a/Source/MQTTnet.Server/Program.cs
+++ b/Source/MQTTnet.Server/Program.cs
@@ -3,6 +3,7 @@ using Microsoft.Extensions.Hosting;
 using MQTTnet.Server.Web;
 using System;
 using System.Diagnostics;
+using System.IO;
 using System.Reflection;
 
 namespace MQTTnet.Server
@@ -21,8 +22,8 @@ namespace MQTTnet.Server
                         webBuilder.ConfigureKestrel(serverOptions =>
                         {
                         })
+                        .UseWebRoot(Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "Web", "wwwroot"))
                         .UseStartup<Startup>();
-
                     }).Build().Run();
 
                 return 0;
diff --git a/Source/MQTTnet.Server/Web/wwwroot/Hello.txt b/Source/MQTTnet.Server/Web/wwwroot/Hello.txt
new file mode 100644
index 00000000..782edd32
--- /dev/null
+++ b/Source/MQTTnet.Server/Web/wwwroot/Hello.txt
@@ -0,0 +1 @@
+World
\ No newline at end of file
diff --git a/Source/MQTTnet.Server/Web/wwwroot/pahoJS_Test.html b/Source/MQTTnet.Server/Web/wwwroot/pahoJS_Test.html
new file mode 100644
index 00000000..9f445797
--- /dev/null
+++ b/Source/MQTTnet.Server/Web/wwwroot/pahoJS_Test.html
@@ -0,0 +1,41 @@
+<html>
+
+<head>
+    <title>paho JS Example</title>
+
+    <script src="https://cdnjs.cloudflare.com/ajax/libs/paho-mqtt/1.0.1/mqttws31.js" type="text/javascript"></script>
+
+    <script type="text/javascript">
+        var mqttClient = new Paho.MQTT.Client("localhost", 80, "/mqtt", "pahoJS_client");
+        mqttClient.onConnectionLost = onConnectionLost;
+        mqttClient.onMessageArrived = onMessageArrived;
+        mqttClient.connect({ onSuccess: onConnect });
+
+        function onConnect() {
+            console.log("MQTT client connected");
+            mqttClient.subscribe("pahoJS_subscription");
+        }
+
+        function onConnectionLost(responseObject) {
+            if (responseObject.errorCode !== 0) {
+                console.log("onConnectionLost:" + responseObject.errorMessage);
+            }
+        }
+
+        function onMessageArrived(message) {
+            console.log("onMessageArrived:" + message.payloadString);
+        }
+        function buttonClick() {
+            message = new Paho.MQTT.Message("Hello");
+            message.destinationName = "pahoJS_topic";
+            mqttClient.send(message);
+        }
+    </script>
+
+</head>
+
+<body>
+    <button onclick="buttonClick()">Publish</button>
+</body>
+
+</html>
\ No newline at end of file