diff --git a/source/distro/changelog.txt b/source/distro/changelog.txt
index 94ad696..1fcaf44 100644
--- a/source/distro/changelog.txt
+++ b/source/distro/changelog.txt
@@ -2,9 +2,12 @@ Changelog for Writer2LaTeX version 1.4 -> 1.6
 
 ---------- version 1.5.3 ----------
 
+[w2x] Bugfix: writer2latex.xhtml.TableConverter.borderWidth ran into an infinite loop if border shorthand properties
+  didn't begin with width, but e.g. with colour (e.g. "#000000 0.035cm solid").  
+  See bug tracker #4 fix for infinite loop in writer2latex.xhtml.TableConverter.borderWidth
+
 [w2l] If use_bibtex is false, the bibliography is now exported using a thebibliography environment rather than as
   plain text
-  TODO: Debugging and test
 
 [w2x] The bibliography is now regenerated from the template. This implies that bibliographic citations now link
   directly to the cited work rather than to the bibliography as a whole.
diff --git a/source/java/writer2latex/api/ConverterFactory.java b/source/java/writer2latex/api/ConverterFactory.java
index 62918ca..375cc0b 100644
--- a/source/java/writer2latex/api/ConverterFactory.java
+++ b/source/java/writer2latex/api/ConverterFactory.java
@@ -20,7 +20,7 @@
  *
  *  All Rights Reserved.
  * 
- *  Version 1.6 (2015-06-19)
+ *  Version 1.6 (2015-06-23)
  *
  */
  
@@ -33,7 +33,7 @@ public class ConverterFactory {
 
     // Version information
     private static final String VERSION = "1.5.3";
-    private static final String DATE = "2015-06-19";
+    private static final String DATE = "2015-06-23";
 	
     /** Return the Writer2LaTeX version in the form
      *  (major version).(minor version).(patch level)<br/>
diff --git a/source/java/writer2latex/xhtml/TableConverter.java b/source/java/writer2latex/xhtml/TableConverter.java
index b09309b..76655ac 100644
--- a/source/java/writer2latex/xhtml/TableConverter.java
+++ b/source/java/writer2latex/xhtml/TableConverter.java
@@ -16,11 +16,11 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
  *  MA  02111-1307  USA
  *
- *  Copyright: 2002-2012 by Henrik Just
+ *  Copyright: 2002-2015 by Henrik Just
  *
  *  All Rights Reserved.
  * 
- *  Version 1.4 (2012-04-12)
+ *  Version 1.6 (2015-06-23)
  *
  */
 
@@ -478,7 +478,7 @@ public class TableConverter extends ConverterHelper {
                 return in.getNumber()+in.getIdentifier();
             }
             // skip other characters
-            while (in.peekChar()!=' ' && in.peekChar()!='\0') { } 
+            while (in.peekChar()!=' ' && in.peekChar()!='\0') { in.getChar(); } 
         }
         return "0";
     }