diff --git a/Source/com/drew/metadata/mkv/MkvReader.java b/Source/com/drew/metadata/mkv/MkvReader.java
index 325d9943d..69aaca2b5 100644
--- a/Source/com/drew/metadata/mkv/MkvReader.java
+++ b/Source/com/drew/metadata/mkv/MkvReader.java
@@ -138,9 +138,11 @@ private void createDirectories(Map<Integer, Object> data, Metadata metadata)
             {
                 case 1:
                     dir = new VideoDirectory();
+                    mapToDirectory(dir, (Map<Integer, Object>) data.get(ElementIDs.VIDEO));
                     break;
                 case 2:
                     dir = new AudioDirectory();
+                    mapToDirectory(dir, (Map<Integer, Object>) data.get(ElementIDs.AUDIO));
                     break;
             }
             if (dir != null)
@@ -219,6 +221,7 @@ private void extractSubContext(final SequentialReader reader, Map<Integer, Objec
         long size = decodeInteger(reader);
         Object value = null;
         EbmlElement element = ELEMENTS.get(eid);
+
         if (element == null)
         {
             element = new EbmlElement(String.format("0x%02X [ unknown ]", eid), UNKNOWN);
@@ -230,6 +233,10 @@ private void extractSubContext(final SequentialReader reader, Map<Integer, Objec
                 break;
             case INTEGER:
                 value = DataParser.getLong(reader, size);
+                if (eid == ElementIDs.DISPLAY_WIDTH)
+                {
+                    System.out.println("VALUE " + value);
+                }
                 break;
             case BINARY:
                 value = DataParser.getByteArray(reader, size);
diff --git a/Source/com/drew/metadata/mkv/VideoDirectory.java b/Source/com/drew/metadata/mkv/VideoDirectory.java
index 8bb8c3ea4..a8ea68e26 100644
--- a/Source/com/drew/metadata/mkv/VideoDirectory.java
+++ b/Source/com/drew/metadata/mkv/VideoDirectory.java
@@ -32,6 +32,7 @@ public class VideoDirectory extends Directory
         _tagNameMap.put(RANGE, "Color range");
         _tagNameMap.put(DISPLAY_WIDTH, "Display width");
         _tagNameMap.put(DISPLAY_HEIGHT, "Display height");
+        _tagNameMap.put(DISPLAY_UNIT, "Display unit");
     }
 
     public VideoDirectory()