diff --git a/Caching/FileDbCache.WPF/Properties/AssemblyInfo.cs b/Caching/FileDbCache.WPF/Properties/AssemblyInfo.cs
index e6381911..5aa9cf21 100644
--- a/Caching/FileDbCache.WPF/Properties/AssemblyInfo.cs
+++ b/Caching/FileDbCache.WPF/Properties/AssemblyInfo.cs
@@ -7,8 +7,8 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyCompany("Clemens Fischer")]
 [assembly: AssemblyCopyright("© 2015 Clemens Fischer")]
 [assembly: AssemblyTrademark("")]
-[assembly: AssemblyVersion("2.4.11")]
-[assembly: AssemblyFileVersion("2.4.11")]
+[assembly: AssemblyVersion("2.4.12")]
+[assembly: AssemblyFileVersion("2.4.12")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCulture("")]
 [assembly: ComVisible(false)]
diff --git a/Caching/FileDbCache.WinRT/Properties/AssemblyInfo.cs b/Caching/FileDbCache.WinRT/Properties/AssemblyInfo.cs
index c61c605c..7b11a963 100644
--- a/Caching/FileDbCache.WinRT/Properties/AssemblyInfo.cs
+++ b/Caching/FileDbCache.WinRT/Properties/AssemblyInfo.cs
@@ -7,8 +7,8 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyCompany("Clemens Fischer")]
 [assembly: AssemblyCopyright("© 2015 Clemens Fischer")]
 [assembly: AssemblyTrademark("")]
-[assembly: AssemblyVersion("2.4.11")]
-[assembly: AssemblyFileVersion("2.4.11")]
+[assembly: AssemblyVersion("2.4.12")]
+[assembly: AssemblyFileVersion("2.4.12")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCulture("")]
 [assembly: ComVisible(false)]
diff --git a/Caching/ImageFileCache.WPF/Properties/AssemblyInfo.cs b/Caching/ImageFileCache.WPF/Properties/AssemblyInfo.cs
index f2c6d1cf..acab422f 100644
--- a/Caching/ImageFileCache.WPF/Properties/AssemblyInfo.cs
+++ b/Caching/ImageFileCache.WPF/Properties/AssemblyInfo.cs
@@ -7,8 +7,8 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyCompany("Clemens Fischer")]
 [assembly: AssemblyCopyright("© 2015 Clemens Fischer")]
 [assembly: AssemblyTrademark("")]
-[assembly: AssemblyVersion("2.4.11")]
-[assembly: AssemblyFileVersion("2.4.11")]
+[assembly: AssemblyVersion("2.4.12")]
+[assembly: AssemblyFileVersion("2.4.12")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCulture("")]
 [assembly: ComVisible(false)]
diff --git a/Caching/ImageFileCache.WinRT/Properties/AssemblyInfo.cs b/Caching/ImageFileCache.WinRT/Properties/AssemblyInfo.cs
index 90d66247..f02ed2ca 100644
--- a/Caching/ImageFileCache.WinRT/Properties/AssemblyInfo.cs
+++ b/Caching/ImageFileCache.WinRT/Properties/AssemblyInfo.cs
@@ -7,8 +7,8 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyCompany("Clemens Fischer")]
 [assembly: AssemblyCopyright("© 2015 Clemens Fischer")]
 [assembly: AssemblyTrademark("")]
-[assembly: AssemblyVersion("2.4.11")]
-[assembly: AssemblyFileVersion("2.4.11")]
+[assembly: AssemblyVersion("2.4.12")]
+[assembly: AssemblyFileVersion("2.4.12")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCulture("")]
 [assembly: ComVisible(false)]
diff --git a/MapControl/Map.WinRT.cs b/MapControl/Map.WinRT.cs
index 80b151fd..8674ac7b 100644
--- a/MapControl/Map.WinRT.cs
+++ b/MapControl/Map.WinRT.cs
@@ -79,7 +79,7 @@ namespace MapControl
 
         private void OnManipulationDelta(object sender, ManipulationDeltaRoutedEventArgs e)
         {
-            if (e.PointerDeviceType != PointerDeviceType.Mouse)
+            if (e.PointerDeviceType == PointerDeviceType.Touch)
             {
                 TransformMap(e.Position, e.Delta.Translation, e.Delta.Rotation, e.Delta.Scale);
             }
diff --git a/MapControl/MapBase.cs b/MapControl/MapBase.cs
index d2c0c545..bd982572 100644
--- a/MapControl/MapBase.cs
+++ b/MapControl/MapBase.cs
@@ -455,7 +455,7 @@ namespace MapControl
                 }
 
                 TileLayer = null;
-                RemoveTileLayers(0, oldTileLayers.Count);
+                ClearTileLayers();
             }
 
             if (newTileLayers != null)
@@ -491,10 +491,7 @@ namespace MapControl
                     break;
 
                 case NotifyCollectionChangedAction.Reset:
-                    if (e.OldItems != null)
-                    {
-                        RemoveTileLayers(0, e.OldItems.Count);
-                    }
+                    ClearTileLayers();
                     if (e.NewItems != null)
                     {
                         AddTileLayers(0, e.NewItems.Cast<TileLayer>());
@@ -548,6 +545,13 @@ namespace MapControl
             }
         }
 
+        private void ClearTileLayers()
+        {
+            tileLayerPanel.Children.Clear();
+            ClearValue(BackgroundProperty);
+            ClearValue(ForegroundProperty);
+        }
+
         private void InternalSetValue(DependencyProperty property, object value)
         {
             internalPropertyChange = true;
diff --git a/MapControl/Properties/AssemblyInfo.cs b/MapControl/Properties/AssemblyInfo.cs
index 78efad36..c9af73b3 100644
--- a/MapControl/Properties/AssemblyInfo.cs
+++ b/MapControl/Properties/AssemblyInfo.cs
@@ -17,8 +17,8 @@ using System.Windows;
 [assembly: AssemblyCompany("Clemens Fischer")]
 [assembly: AssemblyCopyright("© 2015 Clemens Fischer")]
 [assembly: AssemblyTrademark("")]
-[assembly: AssemblyVersion("2.4.11")]
-[assembly: AssemblyFileVersion("2.4.11")]
+[assembly: AssemblyVersion("2.4.12")]
+[assembly: AssemblyFileVersion("2.4.12")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCulture("")]
 [assembly: ComVisible(false)]
diff --git a/MapControl/TileImageLoader.WPF.cs b/MapControl/TileImageLoader.WPF.cs
index ac3ab4b9..8aca3448 100644
--- a/MapControl/TileImageLoader.WPF.cs
+++ b/MapControl/TileImageLoader.WPF.cs
@@ -152,7 +152,11 @@ namespace MapControl
 
                     if (uri != null)
                     {
-                        if (uri.Scheme == "file") // load from FileStream as loading from Uri leaves file open
+                        if (!uri.IsAbsoluteUri)
+                        {
+                            image = LoadImage(uri.OriginalString);
+                        }
+                        else if (uri.Scheme == "file")
                         {
                             image = LoadImage(uri.LocalPath);
                         }
diff --git a/MapControl/TileSource.cs b/MapControl/TileSource.cs
index 1a79d95d..9e079555 100644
--- a/MapControl/TileSource.cs
+++ b/MapControl/TileSource.cs
@@ -87,7 +87,8 @@ namespace MapControl
             return new Uri(uriFormat.
                 Replace("{x}", x.ToString()).
                 Replace("{y}", y.ToString()).
-                Replace("{z}", zoomLevel.ToString()));
+                Replace("{z}", zoomLevel.ToString()),
+                UriKind.RelativeOrAbsolute);
         }
 
         private Uri GetOpenStreetMapUri(int x, int y, int zoomLevel)
@@ -98,7 +99,8 @@ namespace MapControl
                 Replace("{c}", "abc".Substring(hostIndex, 1)).
                 Replace("{x}", x.ToString()).
                 Replace("{y}", y.ToString()).
-                Replace("{z}", zoomLevel.ToString()));
+                Replace("{z}", zoomLevel.ToString()),
+                UriKind.RelativeOrAbsolute);
         }
 
         private Uri GetGoogleMapsUri(int x, int y, int zoomLevel)
@@ -109,7 +111,8 @@ namespace MapControl
                 Replace("{i}", hostIndex.ToString()).
                 Replace("{x}", x.ToString()).
                 Replace("{y}", y.ToString()).
-                Replace("{z}", zoomLevel.ToString()));
+                Replace("{z}", zoomLevel.ToString()),
+                UriKind.RelativeOrAbsolute);
         }
 
         private Uri GetMapQuestUri(int x, int y, int zoomLevel)
@@ -120,7 +123,8 @@ namespace MapControl
                 Replace("{n}", hostIndex.ToString()).
                 Replace("{x}", x.ToString()).
                 Replace("{y}", y.ToString()).
-                Replace("{z}", zoomLevel.ToString()));
+                Replace("{z}", zoomLevel.ToString()),
+                UriKind.RelativeOrAbsolute);
         }
 
         private Uri GetTmsUri(int x, int y, int zoomLevel)
@@ -130,7 +134,8 @@ namespace MapControl
             return new Uri(uriFormat.
                 Replace("{x}", x.ToString()).
                 Replace("{v}", y.ToString()).
-                Replace("{z}", zoomLevel.ToString()));
+                Replace("{z}", zoomLevel.ToString()),
+                UriKind.RelativeOrAbsolute);
         }
 
         private Uri GetQuadKeyUri(int x, int y, int zoomLevel)
@@ -149,7 +154,8 @@ namespace MapControl
 
             return new Uri(uriFormat.
                 Replace("{i}", new string(quadkey[zoomLevel - 1], 1)).
-                Replace("{q}", new string(quadkey)));
+                Replace("{q}", new string(quadkey)),
+                UriKind.RelativeOrAbsolute);
         }
 
         private Uri GetBoundingBoxUri(int x, int y, int zoomLevel)
diff --git a/MapControl/WinRT/Properties/AssemblyInfo.cs b/MapControl/WinRT/Properties/AssemblyInfo.cs
index e5a0f512..c589beb5 100644
--- a/MapControl/WinRT/Properties/AssemblyInfo.cs
+++ b/MapControl/WinRT/Properties/AssemblyInfo.cs
@@ -7,8 +7,8 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyCompany("Clemens Fischer")]
 [assembly: AssemblyCopyright("© 2015 Clemens Fischer")]
 [assembly: AssemblyTrademark("")]
-[assembly: AssemblyVersion("2.4.11")]
-[assembly: AssemblyFileVersion("2.4.11")]
+[assembly: AssemblyVersion("2.4.12")]
+[assembly: AssemblyFileVersion("2.4.12")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCulture("")]
 [assembly: ComVisible(false)]
diff --git a/SampleApps/PhoneApplication/Properties/AssemblyInfo.cs b/SampleApps/PhoneApplication/Properties/AssemblyInfo.cs
index 84c3853e..a00ea371 100644
--- a/SampleApps/PhoneApplication/Properties/AssemblyInfo.cs
+++ b/SampleApps/PhoneApplication/Properties/AssemblyInfo.cs
@@ -7,8 +7,8 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyCompany("Clemens Fischer")]
 [assembly: AssemblyCopyright("© 2015 Clemens Fischer")]
 [assembly: AssemblyTrademark("")]
-[assembly: AssemblyVersion("2.4.11")]
-[assembly: AssemblyFileVersion("2.4.11")]
+[assembly: AssemblyVersion("2.4.12")]
+[assembly: AssemblyFileVersion("2.4.12")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCulture("")]
 [assembly: ComVisible(false)]
diff --git a/SampleApps/SilverlightApplication.Web/Properties/AssemblyInfo.cs b/SampleApps/SilverlightApplication.Web/Properties/AssemblyInfo.cs
index 63a1bacc..b8c85e41 100644
--- a/SampleApps/SilverlightApplication.Web/Properties/AssemblyInfo.cs
+++ b/SampleApps/SilverlightApplication.Web/Properties/AssemblyInfo.cs
@@ -7,8 +7,8 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyCompany("Clemens Fischer")]
 [assembly: AssemblyCopyright("© 2015 Clemens Fischer")]
 [assembly: AssemblyTrademark("")]
-[assembly: AssemblyVersion("2.4.11")]
-[assembly: AssemblyFileVersion("2.4.11")]
+[assembly: AssemblyVersion("2.4.12")]
+[assembly: AssemblyFileVersion("2.4.12")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCulture("")]
 [assembly: ComVisible(false)]
diff --git a/SampleApps/SilverlightApplication/Properties/AssemblyInfo.cs b/SampleApps/SilverlightApplication/Properties/AssemblyInfo.cs
index 9a172ea1..ac205347 100644
--- a/SampleApps/SilverlightApplication/Properties/AssemblyInfo.cs
+++ b/SampleApps/SilverlightApplication/Properties/AssemblyInfo.cs
@@ -7,8 +7,8 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyCompany("Clemens Fischer")]
 [assembly: AssemblyCopyright("© 2015 Clemens Fischer")]
 [assembly: AssemblyTrademark("")]
-[assembly: AssemblyVersion("2.4.11")]
-[assembly: AssemblyFileVersion("2.4.11")]
+[assembly: AssemblyVersion("2.4.12")]
+[assembly: AssemblyFileVersion("2.4.12")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCulture("")]
 [assembly: ComVisible(false)]
diff --git a/SampleApps/StoreApplication/Properties/AssemblyInfo.cs b/SampleApps/StoreApplication/Properties/AssemblyInfo.cs
index e33d4a4f..0a9dcb00 100644
--- a/SampleApps/StoreApplication/Properties/AssemblyInfo.cs
+++ b/SampleApps/StoreApplication/Properties/AssemblyInfo.cs
@@ -7,8 +7,8 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyCompany("Clemens Fischer")]
 [assembly: AssemblyCopyright("© 2015 Clemens Fischer")]
 [assembly: AssemblyTrademark("")]
-[assembly: AssemblyVersion("2.4.11")]
-[assembly: AssemblyFileVersion("2.4.11")]
+[assembly: AssemblyVersion("2.4.12")]
+[assembly: AssemblyFileVersion("2.4.12")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCulture("")]
 [assembly: ComVisible(false)]
diff --git a/SampleApps/WpfApplication/Properties/AssemblyInfo.cs b/SampleApps/WpfApplication/Properties/AssemblyInfo.cs
index f43f9d9b..57309aca 100644
--- a/SampleApps/WpfApplication/Properties/AssemblyInfo.cs
+++ b/SampleApps/WpfApplication/Properties/AssemblyInfo.cs
@@ -7,8 +7,8 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyCompany("Clemens Fischer")]
 [assembly: AssemblyCopyright("© 2015 Clemens Fischer")]
 [assembly: AssemblyTrademark("")]
-[assembly: AssemblyVersion("2.4.11")]
-[assembly: AssemblyFileVersion("2.4.11")]
+[assembly: AssemblyVersion("2.4.12")]
+[assembly: AssemblyFileVersion("2.4.12")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCulture("")]
 [assembly: ComVisible(false)]