diff --git a/src/ImageProcessor/Processors/Watermark.cs b/src/ImageProcessor/Processors/Watermark.cs
index 25b4499876..25abe65e36 100644
--- a/src/ImageProcessor/Processors/Watermark.cs
+++ b/src/ImageProcessor/Processors/Watermark.cs
@@ -37,7 +37,7 @@ namespace ImageProcessor.Processors
         /// <summary>
         /// The regular expression to search strings for the position attribute.
         /// </summary>
-        private static readonly Regex PositionRegex = new Regex(@"position-\d+-\d+", RegexOptions.Compiled);
+        private static readonly Regex PositionRegex = new Regex(@"position-\d+[-,]\d+", RegexOptions.Compiled);
 
         /// <summary>
         /// The regular expression to search strings for the color attribute.
diff --git a/src/Nuget/ImageProcessor.1.8.0.0.nupkg b/src/Nuget/ImageProcessor.1.8.0.0.nupkg
new file mode 100644
index 0000000000..00ab82b0c8
Binary files /dev/null and b/src/Nuget/ImageProcessor.1.8.0.0.nupkg differ
diff --git a/src/Nuget/ImageProcessor.Web.3.0.0.0.nupkg b/src/Nuget/ImageProcessor.Web.3.0.0.0.nupkg
new file mode 100644
index 0000000000..6821b76764
Binary files /dev/null and b/src/Nuget/ImageProcessor.Web.3.0.0.0.nupkg differ
diff --git a/src/TestWebsites/NET45/Test_Website_NET45/Views/Home/Index.cshtml b/src/TestWebsites/NET45/Test_Website_NET45/Views/Home/Index.cshtml
index adde1b4a6f..25593e8ff9 100644
--- a/src/TestWebsites/NET45/Test_Website_NET45/Views/Home/Index.cshtml
+++ b/src/TestWebsites/NET45/Test_Website_NET45/Views/Home/Index.cshtml
@@ -10,7 +10,7 @@
                 <img src="/images/Penguins.jpg?width=300" />
                 <h3>Foreign language test.</h3>
                 <img src="/images/udendørs.jpg?width=300" />
-                <img src="/images/udendørs.jpg?preset=a&filter=comic" />
+                <img src="/images/udendørs.jpg?preset=demo&filter=comic" />
             </div>
             <div class="col-s-6">
                 <h2>Cropped </h2>
@@ -127,7 +127,7 @@
         <div class="row">
             <div class="col-s-6">
                 <h2>Rotate</h2>
-                <img src="/images/Penguins.jpg?width=300&rotate=angle-54|bgcolor-fff" />
+                <img src="/images/Penguins.jpg?width=300&rotate=angle-54,bgcolor-fff" />
             </div>
             <div class="col-s-6">
                 <h2>Quality</h2>
diff --git a/src/TestWebsites/NET45/Test_Website_NET45/config/imageprocessor/processing.config b/src/TestWebsites/NET45/Test_Website_NET45/config/imageprocessor/processing.config
index c1efcd9dda..21e2d0b463 100644
--- a/src/TestWebsites/NET45/Test_Website_NET45/config/imageprocessor/processing.config
+++ b/src/TestWebsites/NET45/Test_Website_NET45/config/imageprocessor/processing.config
@@ -9,7 +9,7 @@
       </plugin>
       <plugin name="Preset">
         <settings>
-          <setting key="a" value="width=300&#038;height=150"/>
+          <!--<setting key="demo" value="width=300&#038;height=150"/>-->
         </settings>
       </plugin>
     </plugins>
diff --git a/src/TestWebsites/NET45/Test_Website_NET45/config/imageprocessor/security.config b/src/TestWebsites/NET45/Test_Website_NET45/config/imageprocessor/security.config
index cc735ce2f5..8a57162905 100644
--- a/src/TestWebsites/NET45/Test_Website_NET45/config/imageprocessor/security.config
+++ b/src/TestWebsites/NET45/Test_Website_NET45/config/imageprocessor/security.config
@@ -2,7 +2,6 @@
   <security allowRemoteDownloads="true" timeout="300000" maxBytes="524288" remotePrefix="/remote.axd">
     <whiteList>
       <add url="http://images.mymovies.net"/>
-      <add url="http://www.theworldeffect.com" />
       <add url="http://maps.googleapis.com" extensionLess="true" imageFormat=".png"/>
     </whiteList>
   </security>