diff --git a/build.xml b/build.xml
index a4046a25..e3cc316d 100644
--- a/build.xml
+++ b/build.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Version: $Id: build.xml 495 2011-07-07 20:14:37Z chth $ -->
 <project name="openseadragon" 
-         default="www">
+         default="build">
 
 	<tstamp/>
     
@@ -73,8 +73,6 @@
         <publish page='ui-toolbar' title='Toolbar | '/>
         <publish page='ui-viewport-navigator' title='Viewport Navigator | '/>
 
-        <publish page='workspace-dzi' title='Workspace - DZI | '/>
-
         <publish page='developer-debug-mode' title='Developer Tools - Debug Mode | '/>
 
         <copy todir='${WWW}' file='openseadragon.js' />
@@ -125,4 +123,4 @@
         </sequential>
     </macrodef>
 
-</project>
\ No newline at end of file
+</project>
diff --git a/openseadragon.js b/openseadragon.js
index 2646f1a2..30ca7670 100644
--- a/openseadragon.js
+++ b/openseadragon.js
@@ -5700,17 +5700,16 @@ $.extend( $.DziTileSource.prototype, $.TileSource.prototype, {
      * @param {String} optional - url
      */
     supports: function( data, url ){
-        return ( 
-            data.Image && 
-            "http://schemas.microsoft.com/deepzoom/2008" == data.Image.xmlns
-        ) || (
-            data.documentElement &&
-            "Image" == data.documentElement.tagName &&
-            "http://schemas.microsoft.com/deepzoom/2008" ==
-                data.documentElement.namespaceURI
-        );
-    },
+        var ns;
+        if ( data.Image ) {
+            ns = data.Image.xmlns;
+        } else if ( data.documentElement && "Image" == data.documentElement.tagName ) {
+            ns = data.documentElement.namespaceURI;
+        }
 
+        return ( "http://schemas.microsoft.com/deepzoom/2008" == ns ||
+            "http://schemas.microsoft.com/deepzoom/2009" == ns );
+    },
 
     /**
      * 
diff --git a/src/dzitilesource.js b/src/dzitilesource.js
index b6f8db63..db8c7046 100644
--- a/src/dzitilesource.js
+++ b/src/dzitilesource.js
@@ -69,17 +69,16 @@ $.extend( $.DziTileSource.prototype, $.TileSource.prototype, {
      * @param {String} optional - url
      */
     supports: function( data, url ){
-        return ( 
-            data.Image && 
-            "http://schemas.microsoft.com/deepzoom/2008" == data.Image.xmlns
-        ) || (
-            data.documentElement &&
-            "Image" == data.documentElement.tagName &&
-            "http://schemas.microsoft.com/deepzoom/2008" ==
-                data.documentElement.namespaceURI
-        );
-    },
+        var ns;
+        if ( data.Image ) {
+            ns = data.Image.xmlns;
+        } else if ( data.documentElement && "Image" == data.documentElement.tagName ) {
+            ns = data.documentElement.namespaceURI;
+        }
 
+        return ( "http://schemas.microsoft.com/deepzoom/2008" == ns ||
+            "http://schemas.microsoft.com/deepzoom/2009" == ns );
+    },
 
     /**
      *