diff --git a/2dbarcodes.php b/2dbarcodes.php
index e04b307..6490dfa 100755
--- a/2dbarcodes.php
+++ b/2dbarcodes.php
@@ -1,9 +1,9 @@
 <?php
 //============================================================+
 // File name   : 2dbarcodes.php
-// Version     : 1.0.013
+// Version     : 1.0.014
 // Begin       : 2009-04-07
-// Last Update : 2012-01-12
+// Last Update : 2012-04-30
 // Author      : Nicola Asuni - Tecnick.com LTD - Manor Coach House, Church Hill, Aldershot, Hants, GU12 4RQ, UK - www.tecnick.com - info@tecnick.com
 // License     : GNU-LGPL v3 (http://www.gnu.org/copyleft/lesser.html)
 // -------------------------------------------------------------------
@@ -37,14 +37,14 @@
  * PHP class to creates array representations for 2D barcodes to be used with TCPDF.
  * @package com.tecnick.tcpdf
  * @author Nicola Asuni
- * @version 1.0.013
+ * @version 1.0.014
  */
 
 /**
  * @class TCPDF2DBarcode
  * PHP class to creates array representations for 2D barcodes to be used with TCPDF (http://www.tcpdf.org).
  * @package com.tecnick.tcpdf
- * @version 1.0.013
+ * @version 1.0.014
  * @author Nicola Asuni
  */
 class TCPDF2DBarcode {
@@ -202,9 +202,9 @@ class TCPDF2DBarcode {
 				if ($this->barcode_array['bcode'][$r][$c] == 1) {
 					// draw a single barcode cell
 					if ($imagick) {
-						$bar->rectangle($x, $y, ($x + $w), ($y + $h));
+						$bar->rectangle($x, $y, ($x + $w - 1), ($y + $h - 1));
 					} else {
-						imagefilledrectangle($png, $x, $y, ($x + $w), ($y + $h), $fgcol);
+						imagefilledrectangle($png, $x, $y, ($x + $w - 1), ($y + $h - 1), $fgcol);
 					}
 				}
 				$x += $w;
diff --git a/CHANGELOG.TXT b/CHANGELOG.TXT
index e05924d..d39f102 100755
--- a/CHANGELOG.TXT
+++ b/CHANGELOG.TXT
@@ -1,3 +1,6 @@
+5.9.159 (2012-04-30)
+	- Barcode classes were updated to fix PNG export Bug (ID: 3522291).
+
 5.9.158 (2012-04-22)
 	- Some SVG-related bugs were fixed.
 
diff --git a/README.TXT b/README.TXT
index ee17f3f..57a996e 100755
--- a/README.TXT
+++ b/README.TXT
@@ -8,8 +8,8 @@ http://sourceforge.net/donate/index.php?group_id=128076
 ------------------------------------------------------------
 
 Name: TCPDF
-Version: 5.9.158
-Release date: 2012-04-22
+Version: 5.9.159
+Release date: 2012-04-30
 Author:	Nicola Asuni
 
 Copyright (c) 2002-2012:
diff --git a/barcodes.php b/barcodes.php
index 4027aa7..c6c0172 100755
--- a/barcodes.php
+++ b/barcodes.php
@@ -1,9 +1,9 @@
 <?php
 //============================================================+
 // File name   : barcodes.php
-// Version     : 1.0.023
+// Version     : 1.0.024
 // Begin       : 2008-06-09
-// Last Update : 2012-01-14
+// Last Update : 2012-04-30
 // Author      : Nicola Asuni - Tecnick.com LTD - Manor Coach House, Church Hill, Aldershot, Hants, GU12 4RQ, UK - www.tecnick.com - info@tecnick.com
 // License     : GNU-LGPL v3 (http://www.gnu.org/copyleft/lesser.html)
 // -------------------------------------------------------------------
@@ -37,14 +37,14 @@
  * PHP class to creates array representations for common 1D barcodes to be used with TCPDF.
  * @package com.tecnick.tcpdf
  * @author Nicola Asuni
- * @version 1.0.023
+ * @version 1.0.024
  */
 
 /**
  * @class TCPDFBarcode
  * PHP class to creates array representations for common 1D barcodes to be used with TCPDF (http://www.tcpdf.org).<br>
  * @package com.tecnick.tcpdf
- * @version 1.0.023
+ * @version 1.0.024
  * @author Nicola Asuni
  */
 class TCPDFBarcode {
@@ -201,9 +201,9 @@ class TCPDFBarcode {
 				$y = round(($v['p'] * $h / $this->barcode_array['maxh']), 3);
 				// draw a vertical bar
 				if ($imagick) {
-					$bar->rectangle($x, $y, ($x + $bw), ($y + $bh));
+					$bar->rectangle($x, $y, ($x + $bw - 1), ($y + $bh - 1));
 				} else {
-					imagefilledrectangle($png, $x, $y, ($x + $bw), ($y + $bh), $fgcol);
+					imagefilledrectangle($png, $x, $y, ($x + $bw - 1), ($y + $bh - 1), $fgcol);
 				}
 			}
 			$x += $bw;
diff --git a/tcpdf.php b/tcpdf.php
index 9de968b..f9d82fa 100755
--- a/tcpdf.php
+++ b/tcpdf.php
@@ -1,9 +1,9 @@
 <?php
 //============================================================+
 // File name   : tcpdf.php
-// Version     : 5.9.158
+// Version     : 5.9.159
 // Begin       : 2002-08-03
-// Last Update : 2012-04-22
+// Last Update : 2012-04-30
 // Author      : Nicola Asuni - Tecnick.com LTD - Manor Coach House, Church Hill, Aldershot, Hants, GU12 4RQ, UK - www.tecnick.com - info@tecnick.com
 // License     : http://www.tecnick.com/pagefiles/tcpdf/LICENSE.TXT GNU-LGPLv3
 // -------------------------------------------------------------------
@@ -137,7 +137,7 @@
  * Tools to encode your unicode fonts are on fonts/utils directory.</p>
  * @package com.tecnick.tcpdf
  * @author Nicola Asuni
- * @version 5.9.158
+ * @version 5.9.159
  */
 
 // Main configuration file. Define the K_TCPDF_EXTERNAL_CONFIG constant to skip this file.
@@ -149,7 +149,7 @@ require_once(dirname(__FILE__).'/config/tcpdf_config.php');
  * TCPDF project (http://www.tcpdf.org) has been originally derived in 2002 from the Public Domain FPDF class by Olivier Plathey (http://www.fpdf.org), but now is almost entirely rewritten.<br>
  * @package com.tecnick.tcpdf
  * @brief PHP class for generating PDF documents without requiring external extensions.
- * @version 5.9.158
+ * @version 5.9.159
  * @author Nicola Asuni - info@tecnick.com
  */
 class TCPDF {
@@ -160,7 +160,7 @@ class TCPDF {
 	 * Current TCPDF version.
 	 * @private
 	 */
-	private $tcpdf_version = '5.9.158';
+	private $tcpdf_version = '5.9.159';
 
 	// Protected properties