--- a/Xml/XmlResourceResolver.cs	Sat Jul 14 15:24:17 2012 +0100
+++ b/Xml/XmlResourceResolver.cs	Fri Aug 31 20:40:30 2012 +0100
@@ -19,16 +19,56 @@
 
 		public void AddMapping(string relativeURI, string resourceName)
 		{
-			relativeToUriMap[relativeURI] = resourceName;
+			string key = MakeKey(relativeURI);
+			relativeToUriMap[key] = resourceName;
+		}
+
+		private string MakeKey(string uri)
+		{
+			return "resource:///" + Uri.EscapeUriString(uri);
+		}
+
+		public override Uri ResolveUri(Uri baseUri, string relativeUri)
+		{
+			Uri resolved;
+			if (relativeToUriMap.ContainsKey(relativeUri))
+			{
+				resolved = new Uri(MakeKey(relativeUri));
+			}
+			else if (relativeToUriMap.ContainsKey(MakeKey(relativeUri)))
+			{
+				resolved = new Uri(relativeUri);
+			}
+			else
+			{
+				resolved = base.ResolveUri(baseUri, relativeUri);
+			}
+
+			return resolved;
 		}
 
 		public override object GetEntity(Uri absoluteUri, string role, Type ofObjectToReturn)
 		{
 			string absoluteUriString = absoluteUri.ToString();
+			string key = null;
 
 			if (relativeToUriMap.ContainsKey(absoluteUriString))
 			{
-				string file = relativeToUriMap[absoluteUriString];
+				key = absoluteUriString;
+			}
+			else
+			{
+				string createdKey = MakeKey(absoluteUriString);
+
+				if (relativeToUriMap.ContainsKey(createdKey))
+				{
+					key = createdKey;
+				}
+			}
+
+			if (key != null)
+			{
+				string file = relativeToUriMap[key];
 				Stream stream = assm.GetManifestResourceStream(file);
 				return stream;
 			}