diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
new file mode 100644
index 0000000..52fc2aa
--- /dev/null
+++ b/.gitlab-ci.yml
@@ -0,0 +1,23 @@
+# http://docs.gitlab.com/ce/ci/docker/using_docker_build.html#using-the-gitlab-container-registry
+# The docker tag is the first 6 letters of the Git commit id
+
+job_build_dotnet:
+       stage: build
+       image: archlinux/base:latest
+       variables:
+         GIT_SUBMODULE_STRATEGY: recursive
+       script:
+         - pacman -Syu --needed dotnet-sdk --noconfirm
+         - curl -Lo warp-packer https://github.com/dgiagio/warp/releases/download/v0.3.0/linux-x64.warp-packer && chmod +x warp-packer
+         - dotnet publish -c Release -r linux-x64
+         - dotnet publish -c Release -r osx-x64
+         - dotnet publish -c Release -r win-x64
+         - ./warp-packer --arch linux-x64 --input_dir bin/Release/netcoreapp2.2/linux-x64/publish --exec webmusic --output webmusic.linux.run
+         - ./warp-packer --arch macos-x64 --input_dir bin/Release/netcoreapp2.2/osx-x64/publish --exec webmusic --output webmusic.macos.run
+         - ./warp-packer --arch windows-x64 --input_dir bin/Release/netcoreapp2.2/win-x64/publish --exec webmusic.exe --output webmusic.windows.exe
+         - chmod +x webmusic.linux.run webmusic.macos.run
+       artifacts:
+         paths:
+          - webmusic.linux.run
+          - webmusic.macos.run
+          - webmusic.windows.exe
diff --git a/Pages/Index.cshtml.cs b/Pages/Index.cshtml.cs
index a4eba49..794580d 100644
--- a/Pages/Index.cshtml.cs
+++ b/Pages/Index.cshtml.cs
@@ -22,7 +22,8 @@ namespace webmusic.Pages
         {
             if (Request.QueryString.HasValue)
                 path = HttpUtility.UrlDecode(Request.QueryString.Value.Remove(0,1)
-                    .Replace("+", "%2B"));
+                    .Replace("+", "%2B")
+                    .Replace("?", "%3F"));
             if (path.EndsWith(".m3u"))
                 path = path.Substring(0, path.Length - 4);
             if (path.Contains(".."))