diff --git a/Changes b/Changes
index c0dd87a..db856cd 100644
--- a/Changes
+++ b/Changes
@@ -1,4 +1,4 @@
-0.55.6 2016-08-06
+0.55.6 2016-08-10
         - [bugfix] distance with key "t" uses default foundry (diewald)
 	- [cleanup] Renamed fromJson() to fromKoral() (diewald)
 	- [cleanup] Removed deprecated methods in Krill:
@@ -18,6 +18,7 @@
 	  in case the match was extended to the sentence scope (diewald)
 	- [bugfix] KoralQuery bugs are now correctly moved to responses (diewald)
 	- [security] Do not mirror arbitrary JSON objects (diewald)
+  - [bugfix] Fixed zero-boundary repetition bug (diewald)
 
 0.55.5 2016-05-02
 	- [performance] Changed to a dynamic window for sorting in FocusSpans (margaretha)
diff --git a/src/main/java/de/ids_mannheim/korap/KrillCollection.java b/src/main/java/de/ids_mannheim/korap/KrillCollection.java
index d839422..d49c4d6 100644
--- a/src/main/java/de/ids_mannheim/korap/KrillCollection.java
+++ b/src/main/java/de/ids_mannheim/korap/KrillCollection.java
@@ -8,7 +8,6 @@
 import de.ids_mannheim.korap.util.QueryException;
 import de.ids_mannheim.korap.response.Result;
 
-import org.apache.lucene.search.spans.SpanQuery;
 import org.apache.lucene.search.*;
 import org.apache.lucene.index.*;
 import org.apache.lucene.util.BytesRef;
diff --git a/src/main/java/de/ids_mannheim/korap/query/wrap/SpanQueryWrapper.java b/src/main/java/de/ids_mannheim/korap/query/wrap/SpanQueryWrapper.java
index 0855885..82349b2 100644
--- a/src/main/java/de/ids_mannheim/korap/query/wrap/SpanQueryWrapper.java
+++ b/src/main/java/de/ids_mannheim/korap/query/wrap/SpanQueryWrapper.java
@@ -7,6 +7,7 @@
 import de.ids_mannheim.korap.query.SpanWithinQuery;
 
 // TODO: Add warnings and errors - using KrillQuery
+// TODO: Rename isEmpty to isAny!
 
 /**
  * A wrapper base class for Lucene SpanQueries,
@@ -98,7 +99,7 @@
     /**
      * Boolean value indicating that the wrapped query is
      * <tt>null</tt>, meaning it doesn't match anything at
-     * all.
+     * all (i.e. a zero-width assertion).
      * 
      * For example the segment denoting an adjective
      * in the following Poliqarp expression doen't match
diff --git a/src/test/java/de/ids_mannheim/korap/index/TestMatchIdentifier.java b/src/test/java/de/ids_mannheim/korap/index/TestMatchIdentifier.java
index 7859614..8a0ac45 100644
--- a/src/test/java/de/ids_mannheim/korap/index/TestMatchIdentifier.java
+++ b/src/test/java/de/ids_mannheim/korap/index/TestMatchIdentifier.java
@@ -274,6 +274,13 @@
         assertEquals("tokens", res.at("/field").asText());
         assertEquals("GOE_AGX.00002", res.at("/textSigle").asText());
         assertEquals("Goethe, Johann Wolfgang von", res.at("/author").asText());
+
+        /*
+        km = ki.getMatchInfo(
+			"match-GOE!GOE_AGX.00002-p10-20",
+							 "tokens", true, (String) null, (String) null, true, true, false);	
+        assertEquals("", km.toJsonString());
+		*/		
     };