diff --git a/Changes b/Changes
index 7f86e96..cd3dbfe 100644
--- a/Changes
+++ b/Changes
@@ -1,9 +1,10 @@
-0.18 2016-06-27
+0.18 2016-07-06
         - Added REI test.
 	- Added multiple archive support to korapxml2krill.
 	- Added support for prefix negation in korapxml2krill.
 	- Added support for Malt#Dependency.
 	- Improved test suite for caching and REI.
+	- Added support for MDParser annotation.
 
 0.17 2016-03-22
         - Rewrite siglen to use slashes as separators.
diff --git a/MANIFEST b/MANIFEST
index 6276a6b..c0ca61e 100755
--- a/MANIFEST
+++ b/MANIFEST
@@ -33,6 +33,7 @@
 lib/KorAP/XML/Annotation/Mate/Dependency.pm
 lib/KorAP/XML/Annotation/Mate/Morpho.pm
 lib/KorAP/XML/Annotation/Mate/MorphoAttr.pm
+lib/KorAP/XML/Annotation/MDParser/Dependency.pm
 lib/KorAP/XML/Annotation/OpenNLP/Morpho.pm
 lib/KorAP/XML/Annotation/OpenNLP/Sentences.pm
 lib/KorAP/XML/Annotation/OpenNLP/Morpho.pm
@@ -66,6 +67,7 @@
 t/annotation/corenlp_sentences.t
 t/annotation/dereko_struct.t
 t/annotation/glemm_morpho.t
+t/annotation/mdp_dependency.t
 t/annotation/malt_dependency.t
 t/annotation/mate_dependency.t
 t/annotation/mate_morpho.t
@@ -81,8 +83,6 @@
 t/annotation/xip_morpho.t
 t/annotation/xip_sentences.t
 t/annotation/koralquery.t
-t/benchmark/parse_document.t
-t/benchmark/list_archive_texts.t
 t/real/bzk.t
 t/real/bzk_2.t
 t/real/goethe.t
diff --git a/t/annotation/malt_dependency.t b/t/annotation/malt_dependency.t
index e0bb7be..444df9a 100644
--- a/t/annotation/malt_dependency.t
+++ b/t/annotation/malt_dependency.t
@@ -51,13 +51,3 @@
 
 done_testing;
 __END__
-
-diag $data;
-
-
-
-
-is($data->{stream}->[0]->[2], '<>:xip/s:s$<b>64<i>0<i>129<i>17<b>0', 'Text');
-is($data->{stream}->[0]->[3], '_0$<i>0<i>3', 'Position');
-is($data->{stream}->[-1]->[0], '_17$<i>124<i>128', 'Position');
-
diff --git a/t/annotation/mdp_dependency.t b/t/annotation/mdp_dependency.t
index 919552c..5b6858c 100644
--- a/t/annotation/mdp_dependency.t
+++ b/t/annotation/mdp_dependency.t
@@ -63,7 +63,19 @@
 
 my $stream = $data->{stream};
 
-# diag Dumper $stream->[0];
+is($stream->[0]->[0], '-:tokens$<i>3555', 'Token count');
+
+# Term-to-term
+is($stream->[0]->[1], '<:mdp/d:NMOD$<b>32<i>5', 'Term-to-Term');
+is($stream->[5]->[0], '>:mdp/d:NMOD$<b>32<i>0', 'Term-to-Term');
+
+# Element-to-term
+is($stream->[0]->[8], '<:mdp/d:ROOT$<b>34<i>0<i>317<i>40<i>0', 'Element-to-Term');
+is($stream->[0]->[10], '>:mdp/d:ROOT$<b>33<i>0<i>317<i>0<i>40', 'Term-to-Element');
+
+
+is($stream->[-1]->[0], '>:mdp/d:ROOT$<b>33<i>26130<i>26153<i>3553<i>3554', 'Term-to-Element');
+is($stream->[3553]->[1], '<:mdp/d:ROOT$<b>34<i>26130<i>26153<i>3554<i>3553', 'Element-to-Term');
 
 done_testing;
 __END__
diff --git a/t/corpus/archives/wpd15-single.corenlp.zip b/t/corpus/archives/wpd15-single.corenlp.zip
index f4cfd4e..8d0dd5d 100644
--- a/t/corpus/archives/wpd15-single.corenlp.zip
+++ b/t/corpus/archives/wpd15-single.corenlp.zip
Binary files differ
diff --git a/t/corpus/archives/wpd15-single.malt.zip b/t/corpus/archives/wpd15-single.malt.zip
index 43a5add..20d0e27 100644
--- a/t/corpus/archives/wpd15-single.malt.zip
+++ b/t/corpus/archives/wpd15-single.malt.zip
Binary files differ
diff --git a/t/corpus/archives/wpd15-single.mdparser.zip b/t/corpus/archives/wpd15-single.mdparser.zip
index 8897f7f..36b5656 100644
--- a/t/corpus/archives/wpd15-single.mdparser.zip
+++ b/t/corpus/archives/wpd15-single.mdparser.zip
Binary files differ
diff --git a/t/corpus/archives/wpd15-single.opennlp.zip b/t/corpus/archives/wpd15-single.opennlp.zip
index c10b384..50cf0ca 100644
--- a/t/corpus/archives/wpd15-single.opennlp.zip
+++ b/t/corpus/archives/wpd15-single.opennlp.zip
Binary files differ
diff --git a/t/corpus/archives/wpd15-single.tree_tagger.zip b/t/corpus/archives/wpd15-single.tree_tagger.zip
index 372e15e..06beec9 100644
--- a/t/corpus/archives/wpd15-single.tree_tagger.zip
+++ b/t/corpus/archives/wpd15-single.tree_tagger.zip
Binary files differ
diff --git a/t/corpus/archives/wpd15-single.zip b/t/corpus/archives/wpd15-single.zip
index 89d0426..38b3f21 100644
--- a/t/corpus/archives/wpd15-single.zip
+++ b/t/corpus/archives/wpd15-single.zip
Binary files differ