diff --git a/CHANGELOG.TXT b/CHANGELOG.TXT
index b2e3cd0..87a3404 100755
--- a/CHANGELOG.TXT
+++ b/CHANGELOG.TXT
@@ -1,3 +1,7 @@
+5.8.021 (2010-08-30)
+	- A new CID-0 'chinese' font was added for traditional Chinese.
+	- Bug #3054287 'Inner tags are ignored due to "align" attribute' was fixed.
+
 5.8.020 (2010-08-26)
 	- CSS "catch-all" class selector is now supported.
 
diff --git a/README.TXT b/README.TXT
index 942f5f3..501bbf7 100755
--- a/README.TXT
+++ b/README.TXT
@@ -8,8 +8,8 @@ http:  sourceforge.net/donate/index.php?group_id=128076
 ------------------------------------------------------------
 
 Name: TCPDF
-Version: 5.8.020
-Release date: 2010-08-26
+Version: 5.8.021
+Release date: 2010-08-30
 Author:	Nicola Asuni
 
 Copyright (c) 2002-2010:
diff --git a/doc/classtrees_com-tecnick-tcpdf.html b/doc/classtrees_com-tecnick-tcpdf.html
index c6e6334..febdf27 100644
--- a/doc/classtrees_com-tecnick-tcpdf.html
+++ b/doc/classtrees_com-tecnick-tcpdf.html
@@ -60,7 +60,7 @@
 
         <div class="credit">
 		    <hr />
-		    Documentation generated on Thu, 26 Aug 2010 16:10:44 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
+		    Documentation generated on Mon, 30 Aug 2010 17:41:46 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
 	      </div>
       </td></tr></table>
     </td>
diff --git a/doc/com-tecnick-tcpdf/PDF417.html b/doc/com-tecnick-tcpdf/PDF417.html
index ee64bf3..1ba34b6 100644
--- a/doc/com-tecnick-tcpdf/PDF417.html
+++ b/doc/com-tecnick-tcpdf/PDF417.html
@@ -1003,7 +1003,7 @@ $code)</code>
 
         <div class="credit">
 		    <hr />
-		    Documentation generated on Thu, 26 Aug 2010 16:10:45 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
+		    Documentation generated on Mon, 30 Aug 2010 17:41:47 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
 	      </div>
       </td></tr></table>
     </td>
diff --git a/doc/com-tecnick-tcpdf/QRcode.html b/doc/com-tecnick-tcpdf/QRcode.html
index 2da06c3..8e3ff76 100644
--- a/doc/com-tecnick-tcpdf/QRcode.html
+++ b/doc/com-tecnick-tcpdf/QRcode.html
@@ -84,7 +84,7 @@ Source Location: /qrcode.php<br /><br />
                   
 <h4>Version:</h4>
 <ul>
-  <li>1.0.005</li>
+  <li>1.0.006</li>
 </ul>
 
 <h4>Copyright:</h4>
@@ -263,7 +263,7 @@ Class to create QR-code arrays for TCPDF class.<br /><br /><p>QR Code symbol is
     <td><b>author:</b>&nbsp;&nbsp;</td><td>Nicola Asuni</td>
   </tr>
   <tr>
-    <td><b>version:</b>&nbsp;&nbsp;</td><td>1.0.005</td>
+    <td><b>version:</b>&nbsp;&nbsp;</td><td>1.0.006</td>
   </tr>
   <tr>
     <td><b>copyright:</b>&nbsp;&nbsp;</td><td>2010-2010 Nicola Asuni - Tecnick.com S.r.l (www.tecnick.com) Via Della Pace, 11 - 09044 - Quartucciu (CA) - ITALY - www.tecnick.com - info@tecnick.com</td>
@@ -1330,7 +1330,7 @@ $eclevel = 'L'])</code>
   </div>
   <hr />
 	<a name="methodallocate"></a>
-	<h3>method allocate <span class="smalllinenumber">[line 2130]</span></h3>
+	<h3>method allocate <span class="smalllinenumber">[line 2139]</span></h3>
 	<div class="function">
     <table width="90%" border="0" cellspacing="0" cellpadding="1"><tr><td class="code_border">
     <table width="100%" border="0" cellspacing="0" cellpadding="2"><tr><td class="code">
@@ -1366,7 +1366,7 @@ $setLength)</code>
   </div>
   <hr />
 	<a name="methodappendBitstream"></a>
-	<h3>method appendBitstream <span class="smalllinenumber">[line 2184]</span></h3>
+	<h3>method appendBitstream <span class="smalllinenumber">[line 2193]</span></h3>
 	<div class="function">
     <table width="90%" border="0" cellspacing="0" cellpadding="1"><tr><td class="code_border">
     <table width="100%" border="0" cellspacing="0" cellpadding="2"><tr><td class="code">
@@ -1411,7 +1411,7 @@ $append)</code>
   </div>
   <hr />
 	<a name="methodappendBytes"></a>
-	<h3>method appendBytes <span class="smalllinenumber">[line 2216]</span></h3>
+	<h3>method appendBytes <span class="smalllinenumber">[line 2225]</span></h3>
 	<div class="function">
     <table width="90%" border="0" cellspacing="0" cellpadding="1"><tr><td class="code_border">
     <table width="100%" border="0" cellspacing="0" cellpadding="2"><tr><td class="code">
@@ -1462,7 +1462,7 @@ $data)</code>
   </div>
   <hr />
 	<a name="methodappendNewInputItem"></a>
-	<h3>method appendNewInputItem <span class="smalllinenumber">[line 1702]</span></h3>
+	<h3>method appendNewInputItem <span class="smalllinenumber">[line 1705]</span></h3>
 	<div class="function">
     <table width="90%" border="0" cellspacing="0" cellpadding="1"><tr><td class="code_border">
     <table width="100%" border="0" cellspacing="0" cellpadding="2"><tr><td class="code">
@@ -1516,7 +1516,7 @@ $data)</code>
   </div>
   <hr />
 	<a name="methodappendNum"></a>
-	<h3>method appendNum <span class="smalllinenumber">[line 2201]</span></h3>
+	<h3>method appendNum <span class="smalllinenumber">[line 2210]</span></h3>
 	<div class="function">
     <table width="90%" border="0" cellspacing="0" cellpadding="1"><tr><td class="code_border">
     <table width="100%" border="0" cellspacing="0" cellpadding="2"><tr><td class="code">
@@ -1567,7 +1567,7 @@ $num)</code>
   </div>
   <hr />
 	<a name="methodappendPaddingBit"></a>
-	<h3>method appendPaddingBit <span class="smalllinenumber">[line 2062]</span></h3>
+	<h3>method appendPaddingBit <span class="smalllinenumber">[line 2065]</span></h3>
 	<div class="function">
     <table width="90%" border="0" cellspacing="0" cellpadding="1"><tr><td class="code_border">
     <table width="100%" border="0" cellspacing="0" cellpadding="2"><tr><td class="code">
@@ -1606,7 +1606,7 @@ $bstream)</code>
   </div>
   <hr />
 	<a name="methodbinarize"></a>
-	<h3>method binarize <span class="smalllinenumber">[line 695]</span></h3>
+	<h3>method binarize <span class="smalllinenumber">[line 698]</span></h3>
 	<div class="function">
     <table width="90%" border="0" cellspacing="0" cellpadding="1"><tr><td class="code_border">
     <table width="100%" border="0" cellspacing="0" cellpadding="2"><tr><td class="code">
@@ -1645,7 +1645,7 @@ $frame)</code>
   </div>
   <hr />
 	<a name="methodbitstreamToByte"></a>
-	<h3>method bitstreamToByte <span class="smalllinenumber">[line 2229]</span></h3>
+	<h3>method bitstreamToByte <span class="smalllinenumber">[line 2238]</span></h3>
 	<div class="function">
     <table width="90%" border="0" cellspacing="0" cellpadding="1"><tr><td class="code_border">
     <table width="100%" border="0" cellspacing="0" cellpadding="2"><tr><td class="code">
@@ -1690,7 +1690,7 @@ $bitstream)</code>
   </div>
   <hr />
 	<a name="methodcalcN1N3"></a>
-	<h3>method calcN1N3 <span class="smalllinenumber">[line 1132]</span></h3>
+	<h3>method calcN1N3 <span class="smalllinenumber">[line 1135]</span></h3>
 	<div class="function">
     <table width="90%" border="0" cellspacing="0" cellpadding="1"><tr><td class="code_border">
     <table width="100%" border="0" cellspacing="0" cellpadding="2"><tr><td class="code">
@@ -1729,7 +1729,7 @@ $length)</code>
   </div>
   <hr />
 	<a name="methodcalcParity"></a>
-	<h3>method calcParity <span class="smalllinenumber">[line 1733]</span></h3>
+	<h3>method calcParity <span class="smalllinenumber">[line 1736]</span></h3>
 	<div class="function">
     <table width="90%" border="0" cellspacing="0" cellpadding="1"><tr><td class="code_border">
     <table width="100%" border="0" cellspacing="0" cellpadding="2"><tr><td class="code">
@@ -1768,7 +1768,7 @@ $items)</code>
   </div>
   <hr />
 	<a name="methodcheck"></a>
-	<h3>method check <span class="smalllinenumber">[line 1866]</span></h3>
+	<h3>method check <span class="smalllinenumber">[line 1869]</span></h3>
 	<div class="function">
     <table width="90%" border="0" cellspacing="0" cellpadding="1"><tr><td class="code_border">
     <table width="100%" border="0" cellspacing="0" cellpadding="2"><tr><td class="code">
@@ -1819,7 +1819,7 @@ $data)</code>
   </div>
   <hr />
 	<a name="methodcheckModeAn"></a>
-	<h3>method checkModeAn <span class="smalllinenumber">[line 1799]</span></h3>
+	<h3>method checkModeAn <span class="smalllinenumber">[line 1802]</span></h3>
 	<div class="function">
     <table width="90%" border="0" cellspacing="0" cellpadding="1"><tr><td class="code_border">
     <table width="100%" border="0" cellspacing="0" cellpadding="2"><tr><td class="code">
@@ -1864,7 +1864,7 @@ $data)</code>
   </div>
   <hr />
 	<a name="methodcheckModeKanji"></a>
-	<h3>method checkModeKanji <span class="smalllinenumber">[line 1846]</span></h3>
+	<h3>method checkModeKanji <span class="smalllinenumber">[line 1849]</span></h3>
 	<div class="function">
     <table width="90%" border="0" cellspacing="0" cellpadding="1"><tr><td class="code_border">
     <table width="100%" border="0" cellspacing="0" cellpadding="2"><tr><td class="code">
@@ -1909,7 +1909,7 @@ $data)</code>
   </div>
   <hr />
 	<a name="methodcheckModeNum"></a>
-	<h3>method checkModeNum <span class="smalllinenumber">[line 1751]</span></h3>
+	<h3>method checkModeNum <span class="smalllinenumber">[line 1754]</span></h3>
 	<div class="function">
     <table width="90%" border="0" cellspacing="0" cellpadding="1"><tr><td class="code_border">
     <table width="100%" border="0" cellspacing="0" cellpadding="2"><tr><td class="code">
@@ -1954,7 +1954,7 @@ $data)</code>
   </div>
   <hr />
 	<a name="methodconvertData"></a>
-	<h3>method convertData <span class="smalllinenumber">[line 2033]</span></h3>
+	<h3>method convertData <span class="smalllinenumber">[line 2036]</span></h3>
 	<div class="function">
     <table width="90%" border="0" cellspacing="0" cellpadding="1"><tr><td class="code_border">
     <table width="100%" border="0" cellspacing="0" cellpadding="2"><tr><td class="code">
@@ -1993,7 +1993,7 @@ $items)</code>
   </div>
   <hr />
 	<a name="methodcreateBitStream"></a>
-	<h3>method createBitStream <span class="smalllinenumber">[line 2018]</span></h3>
+	<h3>method createBitStream <span class="smalllinenumber">[line 2021]</span></h3>
 	<div class="function">
     <table width="90%" border="0" cellspacing="0" cellpadding="1"><tr><td class="code_border">
     <table width="100%" border="0" cellspacing="0" cellpadding="2"><tr><td class="code">
@@ -2032,7 +2032,7 @@ $items)</code>
   </div>
   <hr />
 	<a name="methodcreateFrame"></a>
-	<h3>method createFrame <span class="smalllinenumber">[line 2529]</span></h3>
+	<h3>method createFrame <span class="smalllinenumber">[line 2541]</span></h3>
 	<div class="function">
     <table width="90%" border="0" cellspacing="0" cellpadding="1"><tr><td class="code_border">
     <table width="100%" border="0" cellspacing="0" cellpadding="2"><tr><td class="code">
@@ -2071,7 +2071,7 @@ $version)</code>
   </div>
   <hr />
 	<a name="methodeat8"></a>
-	<h3>method eat8 <span class="smalllinenumber">[line 1401]</span></h3>
+	<h3>method eat8 <span class="smalllinenumber">[line 1404]</span></h3>
 	<div class="function">
     <table width="90%" border="0" cellspacing="0" cellpadding="1"><tr><td class="code_border">
     <table width="100%" border="0" cellspacing="0" cellpadding="2"><tr><td class="code">
@@ -2099,7 +2099,7 @@ $version)</code>
   </div>
   <hr />
 	<a name="methodeatAn"></a>
-	<h3>method eatAn <span class="smalllinenumber">[line 1349]</span></h3>
+	<h3>method eatAn <span class="smalllinenumber">[line 1352]</span></h3>
 	<div class="function">
     <table width="90%" border="0" cellspacing="0" cellpadding="1"><tr><td class="code_border">
     <table width="100%" border="0" cellspacing="0" cellpadding="2"><tr><td class="code">
@@ -2127,7 +2127,7 @@ $version)</code>
   </div>
   <hr />
 	<a name="methodeatKanji"></a>
-	<h3>method eatKanji <span class="smalllinenumber">[line 1388]</span></h3>
+	<h3>method eatKanji <span class="smalllinenumber">[line 1391]</span></h3>
 	<div class="function">
     <table width="90%" border="0" cellspacing="0" cellpadding="1"><tr><td class="code_border">
     <table width="100%" border="0" cellspacing="0" cellpadding="2"><tr><td class="code">
@@ -2155,7 +2155,7 @@ $version)</code>
   </div>
   <hr />
 	<a name="methodeatNum"></a>
-	<h3>method eatNum <span class="smalllinenumber">[line 1317]</span></h3>
+	<h3>method eatNum <span class="smalllinenumber">[line 1320]</span></h3>
 	<div class="function">
     <table width="90%" border="0" cellspacing="0" cellpadding="1"><tr><td class="code_border">
     <table width="100%" border="0" cellspacing="0" cellpadding="2"><tr><td class="code">
@@ -2183,7 +2183,7 @@ $version)</code>
   </div>
   <hr />
 	<a name="methodencodeBitStream"></a>
-	<h3>method encodeBitStream <span class="smalllinenumber">[line 1647]</span></h3>
+	<h3>method encodeBitStream <span class="smalllinenumber">[line 1650]</span></h3>
 	<div class="function">
     <table width="90%" border="0" cellspacing="0" cellpadding="1"><tr><td class="code_border">
     <table width="100%" border="0" cellspacing="0" cellpadding="2"><tr><td class="code">
@@ -2228,7 +2228,7 @@ $version)</code>
   </div>
   <hr />
 	<a name="methodencodeMask"></a>
-	<h3>method encodeMask <span class="smalllinenumber">[line 726]</span></h3>
+	<h3>method encodeMask <span class="smalllinenumber">[line 729]</span></h3>
 	<div class="function">
     <table width="90%" border="0" cellspacing="0" cellpadding="1"><tr><td class="code_border">
     <table width="100%" border="0" cellspacing="0" cellpadding="2"><tr><td class="code">
@@ -2264,7 +2264,7 @@ $mask)</code>
   </div>
   <hr />
 	<a name="methodencodeMode8"></a>
-	<h3>method encodeMode8 <span class="smalllinenumber">[line 1593]</span></h3>
+	<h3>method encodeMode8 <span class="smalllinenumber">[line 1596]</span></h3>
 	<div class="function">
     <table width="90%" border="0" cellspacing="0" cellpadding="1"><tr><td class="code_border">
     <table width="100%" border="0" cellspacing="0" cellpadding="2"><tr><td class="code">
@@ -2309,7 +2309,7 @@ $version)</code>
   </div>
   <hr />
 	<a name="methodencodeModeAn"></a>
-	<h3>method encodeModeAn <span class="smalllinenumber">[line 1570]</span></h3>
+	<h3>method encodeModeAn <span class="smalllinenumber">[line 1573]</span></h3>
 	<div class="function">
     <table width="90%" border="0" cellspacing="0" cellpadding="1"><tr><td class="code_border">
     <table width="100%" border="0" cellspacing="0" cellpadding="2"><tr><td class="code">
@@ -2354,7 +2354,7 @@ $version)</code>
   </div>
   <hr />
 	<a name="methodencodeModeKanji"></a>
-	<h3>method encodeModeKanji <span class="smalllinenumber">[line 1609]</span></h3>
+	<h3>method encodeModeKanji <span class="smalllinenumber">[line 1612]</span></h3>
 	<div class="function">
     <table width="90%" border="0" cellspacing="0" cellpadding="1"><tr><td class="code_border">
     <table width="100%" border="0" cellspacing="0" cellpadding="2"><tr><td class="code">
@@ -2399,7 +2399,7 @@ $version)</code>
   </div>
   <hr />
 	<a name="methodencodeModeNum"></a>
-	<h3>method encodeModeNum <span class="smalllinenumber">[line 1541]</span></h3>
+	<h3>method encodeModeNum <span class="smalllinenumber">[line 1544]</span></h3>
 	<div class="function">
     <table width="90%" border="0" cellspacing="0" cellpadding="1"><tr><td class="code_border">
     <table width="100%" border="0" cellspacing="0" cellpadding="2"><tr><td class="code">
@@ -2444,7 +2444,7 @@ $version)</code>
   </div>
   <hr />
 	<a name="methodencodeModeStructure"></a>
-	<h3>method encodeModeStructure <span class="smalllinenumber">[line 1632]</span></h3>
+	<h3>method encodeModeStructure <span class="smalllinenumber">[line 1635]</span></h3>
 	<div class="function">
     <table width="90%" border="0" cellspacing="0" cellpadding="1"><tr><td class="code_border">
     <table width="100%" border="0" cellspacing="0" cellpadding="2"><tr><td class="code">
@@ -2483,7 +2483,7 @@ $inputitem)</code>
   </div>
   <hr />
 	<a name="methodencodeString"></a>
-	<h3>method encodeString <span class="smalllinenumber">[line 710]</span></h3>
+	<h3>method encodeString <span class="smalllinenumber">[line 713]</span></h3>
 	<div class="function">
     <table width="90%" border="0" cellspacing="0" cellpadding="1"><tr><td class="code_border">
     <table width="100%" border="0" cellspacing="0" cellpadding="2"><tr><td class="code">
@@ -2519,7 +2519,7 @@ $string)</code>
   </div>
   <hr />
 	<a name="methodencode_rs_char"></a>
-	<h3>method encode_rs_char <span class="smalllinenumber">[line 2827]</span></h3>
+	<h3>method encode_rs_char <span class="smalllinenumber">[line 2839]</span></h3>
 	<div class="function">
     <table width="90%" border="0" cellspacing="0" cellpadding="1"><tr><td class="code_border">
     <table width="100%" border="0" cellspacing="0" cellpadding="2"><tr><td class="code">
@@ -2570,7 +2570,7 @@ $parity)</code>
   </div>
   <hr />
 	<a name="methodestimateBitsMode8"></a>
-	<h3>method estimateBitsMode8 <span class="smalllinenumber">[line 1827]</span></h3>
+	<h3>method estimateBitsMode8 <span class="smalllinenumber">[line 1830]</span></h3>
 	<div class="function">
     <table width="90%" border="0" cellspacing="0" cellpadding="1"><tr><td class="code_border">
     <table width="100%" border="0" cellspacing="0" cellpadding="2"><tr><td class="code">
@@ -2609,7 +2609,7 @@ $size)</code>
   </div>
   <hr />
 	<a name="methodestimateBitsModeAn"></a>
-	<h3>method estimateBitsModeAn <span class="smalllinenumber">[line 1813]</span></h3>
+	<h3>method estimateBitsModeAn <span class="smalllinenumber">[line 1816]</span></h3>
 	<div class="function">
     <table width="90%" border="0" cellspacing="0" cellpadding="1"><tr><td class="code_border">
     <table width="100%" border="0" cellspacing="0" cellpadding="2"><tr><td class="code">
@@ -2648,7 +2648,7 @@ $size)</code>
   </div>
   <hr />
 	<a name="methodestimateBitsModeKanji"></a>
-	<h3>method estimateBitsModeKanji <span class="smalllinenumber">[line 1836]</span></h3>
+	<h3>method estimateBitsModeKanji <span class="smalllinenumber">[line 1839]</span></h3>
 	<div class="function">
     <table width="90%" border="0" cellspacing="0" cellpadding="1"><tr><td class="code_border">
     <table width="100%" border="0" cellspacing="0" cellpadding="2"><tr><td class="code">
@@ -2687,7 +2687,7 @@ $size)</code>
   </div>
   <hr />
 	<a name="methodestimateBitsModeNum"></a>
-	<h3>method estimateBitsModeNum <span class="smalllinenumber">[line 1765]</span></h3>
+	<h3>method estimateBitsModeNum <span class="smalllinenumber">[line 1768]</span></h3>
 	<div class="function">
     <table width="90%" border="0" cellspacing="0" cellpadding="1"><tr><td class="code_border">
     <table width="100%" border="0" cellspacing="0" cellpadding="2"><tr><td class="code">
@@ -2726,7 +2726,7 @@ $size)</code>
   </div>
   <hr />
 	<a name="methodestimateBitStreamSize"></a>
-	<h3>method estimateBitStreamSize <span class="smalllinenumber">[line 1899]</span></h3>
+	<h3>method estimateBitStreamSize <span class="smalllinenumber">[line 1902]</span></h3>
 	<div class="function">
     <table width="90%" border="0" cellspacing="0" cellpadding="1"><tr><td class="code_border">
     <table width="100%" border="0" cellspacing="0" cellpadding="2"><tr><td class="code">
@@ -2771,7 +2771,7 @@ $version)</code>
   </div>
   <hr />
 	<a name="methodestimateVersion"></a>
-	<h3>method estimateVersion <span class="smalllinenumber">[line 1942]</span></h3>
+	<h3>method estimateVersion <span class="smalllinenumber">[line 1945]</span></h3>
 	<div class="function">
     <table width="90%" border="0" cellspacing="0" cellpadding="1"><tr><td class="code_border">
     <table width="100%" border="0" cellspacing="0" cellpadding="2"><tr><td class="code">
@@ -2810,7 +2810,7 @@ $items)</code>
   </div>
   <hr />
 	<a name="methodevaluateSymbol"></a>
-	<h3>method evaluateSymbol <span class="smalllinenumber">[line 1163]</span></h3>
+	<h3>method evaluateSymbol <span class="smalllinenumber">[line 1166]</span></h3>
 	<div class="function">
     <table width="90%" border="0" cellspacing="0" cellpadding="1"><tr><td class="code_border">
     <table width="100%" border="0" cellspacing="0" cellpadding="2"><tr><td class="code">
@@ -2855,7 +2855,7 @@ $frame)</code>
   </div>
   <hr />
 	<a name="methodgenerateMaskNo"></a>
-	<h3>method generateMaskNo <span class="smalllinenumber">[line 1069]</span></h3>
+	<h3>method generateMaskNo <span class="smalllinenumber">[line 1072]</span></h3>
 	<div class="function">
     <table width="90%" border="0" cellspacing="0" cellpadding="1"><tr><td class="code_border">
     <table width="100%" border="0" cellspacing="0" cellpadding="2"><tr><td class="code">
@@ -2906,7 +2906,7 @@ $frame)</code>
   </div>
   <hr />
 	<a name="methodgetBarcodeArray"></a>
-	<h3>method getBarcodeArray <span class="smalllinenumber">[line 686]</span></h3>
+	<h3>method getBarcodeArray <span class="smalllinenumber">[line 689]</span></h3>
 	<div class="function">
     <table width="90%" border="0" cellspacing="0" cellpadding="1"><tr><td class="code_border">
     <table width="100%" border="0" cellspacing="0" cellpadding="2"><tr><td class="code">
@@ -2934,7 +2934,7 @@ $frame)</code>
   </div>
   <hr />
 	<a name="methodgetBitStream"></a>
-	<h3>method getBitStream <span class="smalllinenumber">[line 2106]</span></h3>
+	<h3>method getBitStream <span class="smalllinenumber">[line 2115]</span></h3>
 	<div class="function">
     <table width="90%" border="0" cellspacing="0" cellpadding="1"><tr><td class="code_border">
     <table width="100%" border="0" cellspacing="0" cellpadding="2"><tr><td class="code">
@@ -2973,7 +2973,7 @@ $items)</code>
   </div>
   <hr />
 	<a name="methodgetByteStream"></a>
-	<h3>method getByteStream <span class="smalllinenumber">[line 2116]</span></h3>
+	<h3>method getByteStream <span class="smalllinenumber">[line 2125]</span></h3>
 	<div class="function">
     <table width="90%" border="0" cellspacing="0" cellpadding="1"><tr><td class="code_border">
     <table width="100%" border="0" cellspacing="0" cellpadding="2"><tr><td class="code">
@@ -3012,7 +3012,7 @@ $items)</code>
   </div>
   <hr />
 	<a name="methodgetCode"></a>
-	<h3>method getCode <span class="smalllinenumber">[line 915]</span></h3>
+	<h3>method getCode <span class="smalllinenumber">[line 918]</span></h3>
 	<div class="function">
     <table width="90%" border="0" cellspacing="0" cellpadding="1"><tr><td class="code_border">
     <table width="100%" border="0" cellspacing="0" cellpadding="2"><tr><td class="code">
@@ -3040,7 +3040,7 @@ $items)</code>
   </div>
   <hr />
 	<a name="methodgetDataLength"></a>
-	<h3>method getDataLength <span class="smalllinenumber">[line 2282]</span></h3>
+	<h3>method getDataLength <span class="smalllinenumber">[line 2294]</span></h3>
 	<div class="function">
     <table width="90%" border="0" cellspacing="0" cellpadding="1"><tr><td class="code_border">
     <table width="100%" border="0" cellspacing="0" cellpadding="2"><tr><td class="code">
@@ -3085,7 +3085,7 @@ $level)</code>
   </div>
   <hr />
 	<a name="methodgetECCLength"></a>
-	<h3>method getECCLength <span class="smalllinenumber">[line 2292]</span></h3>
+	<h3>method getECCLength <span class="smalllinenumber">[line 2304]</span></h3>
 	<div class="function">
     <table width="90%" border="0" cellspacing="0" cellpadding="1"><tr><td class="code_border">
     <table width="100%" border="0" cellspacing="0" cellpadding="2"><tr><td class="code">
@@ -3130,7 +3130,7 @@ $level)</code>
   </div>
   <hr />
 	<a name="methodgetEccSpec"></a>
-	<h3>method getEccSpec <span class="smalllinenumber">[line 2382]</span></h3>
+	<h3>method getEccSpec <span class="smalllinenumber">[line 2394]</span></h3>
 	<div class="function">
     <table width="90%" border="0" cellspacing="0" cellpadding="1"><tr><td class="code_border">
     <table width="100%" border="0" cellspacing="0" cellpadding="2"><tr><td class="code">
@@ -3181,7 +3181,7 @@ $spec)</code>
   </div>
   <hr />
 	<a name="methodgetFormatInfo"></a>
-	<h3>method getFormatInfo <span class="smalllinenumber">[line 2490]</span></h3>
+	<h3>method getFormatInfo <span class="smalllinenumber">[line 2502]</span></h3>
 	<div class="function">
     <table width="90%" border="0" cellspacing="0" cellpadding="1"><tr><td class="code_border">
     <table width="100%" border="0" cellspacing="0" cellpadding="2"><tr><td class="code">
@@ -3226,7 +3226,7 @@ $level)</code>
   </div>
   <hr />
 	<a name="methodgetFrameAt"></a>
-	<h3>method getFrameAt <span class="smalllinenumber">[line 800]</span></h3>
+	<h3>method getFrameAt <span class="smalllinenumber">[line 803]</span></h3>
 	<div class="function">
     <table width="90%" border="0" cellspacing="0" cellpadding="1"><tr><td class="code_border">
     <table width="100%" border="0" cellspacing="0" cellpadding="2"><tr><td class="code">
@@ -3265,7 +3265,7 @@ $at)</code>
   </div>
   <hr />
 	<a name="methodgetMinimumVersion"></a>
-	<h3>method getMinimumVersion <span class="smalllinenumber">[line 2320]</span></h3>
+	<h3>method getMinimumVersion <span class="smalllinenumber">[line 2332]</span></h3>
 	<div class="function">
     <table width="90%" border="0" cellspacing="0" cellpadding="1"><tr><td class="code_border">
     <table width="100%" border="0" cellspacing="0" cellpadding="2"><tr><td class="code">
@@ -3310,7 +3310,7 @@ $level)</code>
   </div>
   <hr />
 	<a name="methodgetNextPosition"></a>
-	<h3>method getNextPosition <span class="smalllinenumber">[line 808]</span></h3>
+	<h3>method getNextPosition <span class="smalllinenumber">[line 811]</span></h3>
 	<div class="function">
     <table width="90%" border="0" cellspacing="0" cellpadding="1"><tr><td class="code_border">
     <table width="100%" border="0" cellspacing="0" cellpadding="2"><tr><td class="code">
@@ -3338,7 +3338,7 @@ $level)</code>
   </div>
   <hr />
 	<a name="methodgetRemainder"></a>
-	<h3>method getRemainder <span class="smalllinenumber">[line 2310]</span></h3>
+	<h3>method getRemainder <span class="smalllinenumber">[line 2322]</span></h3>
 	<div class="function">
     <table width="90%" border="0" cellspacing="0" cellpadding="1"><tr><td class="code_border">
     <table width="100%" border="0" cellspacing="0" cellpadding="2"><tr><td class="code">
@@ -3377,7 +3377,7 @@ $version)</code>
   </div>
   <hr />
 	<a name="methodgetVersionPattern"></a>
-	<h3>method getVersionPattern <span class="smalllinenumber">[line 2477]</span></h3>
+	<h3>method getVersionPattern <span class="smalllinenumber">[line 2489]</span></h3>
 	<div class="function">
     <table width="90%" border="0" cellspacing="0" cellpadding="1"><tr><td class="code_border">
     <table width="100%" border="0" cellspacing="0" cellpadding="2"><tr><td class="code">
@@ -3416,7 +3416,7 @@ $version)</code>
   </div>
   <hr />
 	<a name="methodgetWidth"></a>
-	<h3>method getWidth <span class="smalllinenumber">[line 2301]</span></h3>
+	<h3>method getWidth <span class="smalllinenumber">[line 2313]</span></h3>
 	<div class="function">
     <table width="90%" border="0" cellspacing="0" cellpadding="1"><tr><td class="code_border">
     <table width="100%" border="0" cellspacing="0" cellpadding="2"><tr><td class="code">
@@ -3455,7 +3455,7 @@ $version)</code>
   </div>
   <hr />
 	<a name="methodidentifyMode"></a>
-	<h3>method identifyMode <span class="smalllinenumber">[line 1292]</span></h3>
+	<h3>method identifyMode <span class="smalllinenumber">[line 1295]</span></h3>
 	<div class="function">
     <table width="90%" border="0" cellspacing="0" cellpadding="1"><tr><td class="code_border">
     <table width="100%" border="0" cellspacing="0" cellpadding="2"><tr><td class="code">
@@ -3494,7 +3494,7 @@ $pos)</code>
   </div>
   <hr />
 	<a name="methodinit"></a>
-	<h3>method init <span class="smalllinenumber">[line 864]</span></h3>
+	<h3>method init <span class="smalllinenumber">[line 867]</span></h3>
 	<div class="function">
     <table width="90%" border="0" cellspacing="0" cellpadding="1"><tr><td class="code_border">
     <table width="100%" border="0" cellspacing="0" cellpadding="2"><tr><td class="code">
@@ -3533,7 +3533,7 @@ $spec)</code>
   </div>
   <hr />
 	<a name="methodinit_rs"></a>
-	<h3>method init_rs <span class="smalllinenumber">[line 2702]</span></h3>
+	<h3>method init_rs <span class="smalllinenumber">[line 2714]</span></h3>
 	<div class="function">
     <table width="90%" border="0" cellspacing="0" cellpadding="1"><tr><td class="code_border">
     <table width="100%" border="0" cellspacing="0" cellpadding="2"><tr><td class="code">
@@ -3602,7 +3602,7 @@ $pad)</code>
   </div>
   <hr />
 	<a name="methodinit_rs_char"></a>
-	<h3>method init_rs_char <span class="smalllinenumber">[line 2743]</span></h3>
+	<h3>method init_rs_char <span class="smalllinenumber">[line 2755]</span></h3>
 	<div class="function">
     <table width="90%" border="0" cellspacing="0" cellpadding="1"><tr><td class="code_border">
     <table width="100%" border="0" cellspacing="0" cellpadding="2"><tr><td class="code">
@@ -3671,7 +3671,7 @@ $pad)</code>
   </div>
   <hr />
 	<a name="methodinsertStructuredAppendHeader"></a>
-	<h3>method insertStructuredAppendHeader <span class="smalllinenumber">[line 1715]</span></h3>
+	<h3>method insertStructuredAppendHeader <span class="smalllinenumber">[line 1718]</span></h3>
 	<div class="function">
     <table width="90%" border="0" cellspacing="0" cellpadding="1"><tr><td class="code_border">
     <table width="100%" border="0" cellspacing="0" cellpadding="2"><tr><td class="code">
@@ -3728,7 +3728,7 @@ $parity)</code>
   </div>
   <hr />
 	<a name="methodisalnumat"></a>
-	<h3>method isalnumat <span class="smalllinenumber">[line 1280]</span></h3>
+	<h3>method isalnumat <span class="smalllinenumber">[line 1283]</span></h3>
 	<div class="function">
     <table width="90%" border="0" cellspacing="0" cellpadding="1"><tr><td class="code_border">
     <table width="100%" border="0" cellspacing="0" cellpadding="2"><tr><td class="code">
@@ -3773,7 +3773,7 @@ $pos)</code>
   </div>
   <hr />
 	<a name="methodisdigitat"></a>
-	<h3>method isdigitat <span class="smalllinenumber">[line 1267]</span></h3>
+	<h3>method isdigitat <span class="smalllinenumber">[line 1270]</span></h3>
 	<div class="function">
     <table width="90%" border="0" cellspacing="0" cellpadding="1"><tr><td class="code_border">
     <table width="100%" border="0" cellspacing="0" cellpadding="2"><tr><td class="code">
@@ -3818,7 +3818,7 @@ $pos)</code>
   </div>
   <hr />
 	<a name="methodlengthIndicator"></a>
-	<h3>method lengthIndicator <span class="smalllinenumber">[line 2336]</span></h3>
+	<h3>method lengthIndicator <span class="smalllinenumber">[line 2348]</span></h3>
 	<div class="function">
     <table width="90%" border="0" cellspacing="0" cellpadding="1"><tr><td class="code_border">
     <table width="100%" border="0" cellspacing="0" cellpadding="2"><tr><td class="code">
@@ -3863,7 +3863,7 @@ $version)</code>
   </div>
   <hr />
 	<a name="methodlengthOfCode"></a>
-	<h3>method lengthOfCode <span class="smalllinenumber">[line 1963]</span></h3>
+	<h3>method lengthOfCode <span class="smalllinenumber">[line 1966]</span></h3>
 	<div class="function">
     <table width="90%" border="0" cellspacing="0" cellpadding="1"><tr><td class="code_border">
     <table width="100%" border="0" cellspacing="0" cellpadding="2"><tr><td class="code">
@@ -3914,7 +3914,7 @@ $bits)</code>
   </div>
   <hr />
 	<a name="methodlookAnTable"></a>
-	<h3>method lookAnTable <span class="smalllinenumber">[line 1789]</span></h3>
+	<h3>method lookAnTable <span class="smalllinenumber">[line 1792]</span></h3>
 	<div class="function">
     <table width="90%" border="0" cellspacing="0" cellpadding="1"><tr><td class="code_border">
     <table width="100%" border="0" cellspacing="0" cellpadding="2"><tr><td class="code">
@@ -3950,7 +3950,7 @@ $c)</code>
   </div>
   <hr />
 	<a name="methodmakeMask"></a>
-	<h3>method makeMask <span class="smalllinenumber">[line 1120]</span></h3>
+	<h3>method makeMask <span class="smalllinenumber">[line 1123]</span></h3>
 	<div class="function">
     <table width="90%" border="0" cellspacing="0" cellpadding="1"><tr><td class="code_border">
     <table width="100%" border="0" cellspacing="0" cellpadding="2"><tr><td class="code">
@@ -4007,7 +4007,7 @@ $level)</code>
   </div>
   <hr />
 	<a name="methodmakeMaskNo"></a>
-	<h3>method makeMaskNo <span class="smalllinenumber">[line 1093]</span></h3>
+	<h3>method makeMaskNo <span class="smalllinenumber">[line 1096]</span></h3>
 	<div class="function">
     <table width="90%" border="0" cellspacing="0" cellpadding="1"><tr><td class="code_border">
     <table width="100%" border="0" cellspacing="0" cellpadding="2"><tr><td class="code">
@@ -4076,7 +4076,7 @@ $d)</code>
   </div>
   <hr />
 	<a name="methodmask"></a>
-	<h3>method mask <span class="smalllinenumber">[line 1225]</span></h3>
+	<h3>method mask <span class="smalllinenumber">[line 1228]</span></h3>
 	<div class="function">
     <table width="90%" border="0" cellspacing="0" cellpadding="1"><tr><td class="code_border">
     <table width="100%" border="0" cellspacing="0" cellpadding="2"><tr><td class="code">
@@ -4127,7 +4127,7 @@ $level)</code>
   </div>
   <hr />
 	<a name="methodmask0"></a>
-	<h3>method mask0 <span class="smalllinenumber">[line 988]</span></h3>
+	<h3>method mask0 <span class="smalllinenumber">[line 991]</span></h3>
 	<div class="function">
     <table width="90%" border="0" cellspacing="0" cellpadding="1"><tr><td class="code_border">
     <table width="100%" border="0" cellspacing="0" cellpadding="2"><tr><td class="code">
@@ -4172,7 +4172,7 @@ $y)</code>
   </div>
   <hr />
 	<a name="methodmask1"></a>
-	<h3>method mask1 <span class="smalllinenumber">[line 998]</span></h3>
+	<h3>method mask1 <span class="smalllinenumber">[line 1001]</span></h3>
 	<div class="function">
     <table width="90%" border="0" cellspacing="0" cellpadding="1"><tr><td class="code_border">
     <table width="100%" border="0" cellspacing="0" cellpadding="2"><tr><td class="code">
@@ -4217,7 +4217,7 @@ $y)</code>
   </div>
   <hr />
 	<a name="methodmask2"></a>
-	<h3>method mask2 <span class="smalllinenumber">[line 1008]</span></h3>
+	<h3>method mask2 <span class="smalllinenumber">[line 1011]</span></h3>
 	<div class="function">
     <table width="90%" border="0" cellspacing="0" cellpadding="1"><tr><td class="code_border">
     <table width="100%" border="0" cellspacing="0" cellpadding="2"><tr><td class="code">
@@ -4262,7 +4262,7 @@ $y)</code>
   </div>
   <hr />
 	<a name="methodmask3"></a>
-	<h3>method mask3 <span class="smalllinenumber">[line 1018]</span></h3>
+	<h3>method mask3 <span class="smalllinenumber">[line 1021]</span></h3>
 	<div class="function">
     <table width="90%" border="0" cellspacing="0" cellpadding="1"><tr><td class="code_border">
     <table width="100%" border="0" cellspacing="0" cellpadding="2"><tr><td class="code">
@@ -4307,7 +4307,7 @@ $y)</code>
   </div>
   <hr />
 	<a name="methodmask4"></a>
-	<h3>method mask4 <span class="smalllinenumber">[line 1028]</span></h3>
+	<h3>method mask4 <span class="smalllinenumber">[line 1031]</span></h3>
 	<div class="function">
     <table width="90%" border="0" cellspacing="0" cellpadding="1"><tr><td class="code_border">
     <table width="100%" border="0" cellspacing="0" cellpadding="2"><tr><td class="code">
@@ -4352,7 +4352,7 @@ $y)</code>
   </div>
   <hr />
 	<a name="methodmask5"></a>
-	<h3>method mask5 <span class="smalllinenumber">[line 1038]</span></h3>
+	<h3>method mask5 <span class="smalllinenumber">[line 1041]</span></h3>
 	<div class="function">
     <table width="90%" border="0" cellspacing="0" cellpadding="1"><tr><td class="code_border">
     <table width="100%" border="0" cellspacing="0" cellpadding="2"><tr><td class="code">
@@ -4397,7 +4397,7 @@ $y)</code>
   </div>
   <hr />
 	<a name="methodmask6"></a>
-	<h3>method mask6 <span class="smalllinenumber">[line 1048]</span></h3>
+	<h3>method mask6 <span class="smalllinenumber">[line 1051]</span></h3>
 	<div class="function">
     <table width="90%" border="0" cellspacing="0" cellpadding="1"><tr><td class="code_border">
     <table width="100%" border="0" cellspacing="0" cellpadding="2"><tr><td class="code">
@@ -4442,7 +4442,7 @@ $y)</code>
   </div>
   <hr />
 	<a name="methodmask7"></a>
-	<h3>method mask7 <span class="smalllinenumber">[line 1058]</span></h3>
+	<h3>method mask7 <span class="smalllinenumber">[line 1061]</span></h3>
 	<div class="function">
     <table width="90%" border="0" cellspacing="0" cellpadding="1"><tr><td class="code_border">
     <table width="100%" border="0" cellspacing="0" cellpadding="2"><tr><td class="code">
@@ -4487,7 +4487,7 @@ $y)</code>
   </div>
   <hr />
 	<a name="methodmaximumWords"></a>
-	<h3>method maximumWords <span class="smalllinenumber">[line 2356]</span></h3>
+	<h3>method maximumWords <span class="smalllinenumber">[line 2368]</span></h3>
 	<div class="function">
     <table width="90%" border="0" cellspacing="0" cellpadding="1"><tr><td class="code_border">
     <table width="100%" border="0" cellspacing="0" cellpadding="2"><tr><td class="code">
@@ -4532,7 +4532,7 @@ $version)</code>
   </div>
   <hr />
 	<a name="methodmergeBitStream"></a>
-	<h3>method mergeBitStream <span class="smalllinenumber">[line 2092]</span></h3>
+	<h3>method mergeBitStream <span class="smalllinenumber">[line 2098]</span></h3>
 	<div class="function">
     <table width="90%" border="0" cellspacing="0" cellpadding="1"><tr><td class="code_border">
     <table width="100%" border="0" cellspacing="0" cellpadding="2"><tr><td class="code">
@@ -4577,7 +4577,7 @@ $bstream)</code>
   </div>
   <hr />
 	<a name="methodmodnn"></a>
-	<h3>method modnn <span class="smalllinenumber">[line 2725]</span></h3>
+	<h3>method modnn <span class="smalllinenumber">[line 2737]</span></h3>
 	<div class="function">
     <table width="90%" border="0" cellspacing="0" cellpadding="1"><tr><td class="code_border">
     <table width="100%" border="0" cellspacing="0" cellpadding="2"><tr><td class="code">
@@ -4622,7 +4622,7 @@ $x)</code>
   </div>
   <hr />
 	<a name="methodnewFrame"></a>
-	<h3>method newFrame <span class="smalllinenumber">[line 2594]</span></h3>
+	<h3>method newFrame <span class="smalllinenumber">[line 2606]</span></h3>
 	<div class="function">
     <table width="90%" border="0" cellspacing="0" cellpadding="1"><tr><td class="code_border">
     <table width="100%" border="0" cellspacing="0" cellpadding="2"><tr><td class="code">
@@ -4661,7 +4661,7 @@ $version)</code>
   </div>
   <hr />
 	<a name="methodnewFromBytes"></a>
-	<h3>method newFromBytes <span class="smalllinenumber">[line 2160]</span></h3>
+	<h3>method newFromBytes <span class="smalllinenumber">[line 2169]</span></h3>
 	<div class="function">
     <table width="90%" border="0" cellspacing="0" cellpadding="1"><tr><td class="code_border">
     <table width="100%" border="0" cellspacing="0" cellpadding="2"><tr><td class="code">
@@ -4706,7 +4706,7 @@ $data)</code>
   </div>
   <hr />
 	<a name="methodnewFromNum"></a>
-	<h3>method newFromNum <span class="smalllinenumber">[line 2140]</span></h3>
+	<h3>method newFromNum <span class="smalllinenumber">[line 2149]</span></h3>
 	<div class="function">
     <table width="90%" border="0" cellspacing="0" cellpadding="1"><tr><td class="code_border">
     <table width="100%" border="0" cellspacing="0" cellpadding="2"><tr><td class="code">
@@ -4751,7 +4751,7 @@ $num)</code>
   </div>
   <hr />
 	<a name="methodnewInputItem"></a>
-	<h3>method newInputItem <span class="smalllinenumber">[line 1519]</span></h3>
+	<h3>method newInputItem <span class="smalllinenumber">[line 1522]</span></h3>
 	<div class="function">
     <table width="90%" border="0" cellspacing="0" cellpadding="1"><tr><td class="code_border">
     <table width="100%" border="0" cellspacing="0" cellpadding="2"><tr><td class="code">
@@ -4808,7 +4808,7 @@ $bstream = null])</code>
   </div>
   <hr />
 	<a name="methodputAlignmentMarker"></a>
-	<h3>method putAlignmentMarker <span class="smalllinenumber">[line 2414]</span></h3>
+	<h3>method putAlignmentMarker <span class="smalllinenumber">[line 2426]</span></h3>
 	<div class="function">
     <table width="90%" border="0" cellspacing="0" cellpadding="1"><tr><td class="code_border">
     <table width="100%" border="0" cellspacing="0" cellpadding="2"><tr><td class="code">
@@ -4865,7 +4865,7 @@ $width)</code>
   </div>
   <hr />
 	<a name="methodputAlignmentPattern"></a>
-	<h3>method putAlignmentPattern <span class="smalllinenumber">[line 2437]</span></h3>
+	<h3>method putAlignmentPattern <span class="smalllinenumber">[line 2449]</span></h3>
 	<div class="function">
     <table width="90%" border="0" cellspacing="0" cellpadding="1"><tr><td class="code_border">
     <table width="100%" border="0" cellspacing="0" cellpadding="2"><tr><td class="code">
@@ -4922,7 +4922,7 @@ $fram)</code>
   </div>
   <hr />
 	<a name="methodputFinderPattern"></a>
-	<h3>method putFinderPattern <span class="smalllinenumber">[line 2508]</span></h3>
+	<h3>method putFinderPattern <span class="smalllinenumber">[line 2520]</span></h3>
 	<div class="function">
     <table width="90%" border="0" cellspacing="0" cellpadding="1"><tr><td class="code_border">
     <table width="100%" border="0" cellspacing="0" cellpadding="2"><tr><td class="code">
@@ -4979,7 +4979,7 @@ $width)</code>
   </div>
   <hr />
 	<a name="methodqrstrset"></a>
-	<h3>method qrstrset <span class="smalllinenumber">[line 2271]</span></h3>
+	<h3>method qrstrset <span class="smalllinenumber">[line 2283]</span></h3>
 	<div class="function">
     <table width="90%" border="0" cellspacing="0" cellpadding="1"><tr><td class="code_border">
     <table width="100%" border="0" cellspacing="0" cellpadding="2"><tr><td class="code">
@@ -5042,7 +5042,7 @@ $replLen = false])</code>
   </div>
   <hr />
 	<a name="methodrsBlockNum"></a>
-	<h3>method rsBlockNum <span class="smalllinenumber">[line 2612]</span></h3>
+	<h3>method rsBlockNum <span class="smalllinenumber">[line 2624]</span></h3>
 	<div class="function">
     <table width="90%" border="0" cellspacing="0" cellpadding="1"><tr><td class="code_border">
     <table width="100%" border="0" cellspacing="0" cellpadding="2"><tr><td class="code">
@@ -5081,7 +5081,7 @@ $spec)</code>
   </div>
   <hr />
 	<a name="methodrsBlockNum1"></a>
-	<h3>method rsBlockNum1 <span class="smalllinenumber">[line 2621]</span></h3>
+	<h3>method rsBlockNum1 <span class="smalllinenumber">[line 2633]</span></h3>
 	<div class="function">
     <table width="90%" border="0" cellspacing="0" cellpadding="1"><tr><td class="code_border">
     <table width="100%" border="0" cellspacing="0" cellpadding="2"><tr><td class="code">
@@ -5120,7 +5120,7 @@ $spec)</code>
   </div>
   <hr />
 	<a name="methodrsBlockNum2"></a>
-	<h3>method rsBlockNum2 <span class="smalllinenumber">[line 2648]</span></h3>
+	<h3>method rsBlockNum2 <span class="smalllinenumber">[line 2660]</span></h3>
 	<div class="function">
     <table width="90%" border="0" cellspacing="0" cellpadding="1"><tr><td class="code_border">
     <table width="100%" border="0" cellspacing="0" cellpadding="2"><tr><td class="code">
@@ -5159,7 +5159,7 @@ $spec)</code>
   </div>
   <hr />
 	<a name="methodrsDataCodes1"></a>
-	<h3>method rsDataCodes1 <span class="smalllinenumber">[line 2630]</span></h3>
+	<h3>method rsDataCodes1 <span class="smalllinenumber">[line 2642]</span></h3>
 	<div class="function">
     <table width="90%" border="0" cellspacing="0" cellpadding="1"><tr><td class="code_border">
     <table width="100%" border="0" cellspacing="0" cellpadding="2"><tr><td class="code">
@@ -5198,7 +5198,7 @@ $spec)</code>
   </div>
   <hr />
 	<a name="methodrsDataCodes2"></a>
-	<h3>method rsDataCodes2 <span class="smalllinenumber">[line 2657]</span></h3>
+	<h3>method rsDataCodes2 <span class="smalllinenumber">[line 2669]</span></h3>
 	<div class="function">
     <table width="90%" border="0" cellspacing="0" cellpadding="1"><tr><td class="code_border">
     <table width="100%" border="0" cellspacing="0" cellpadding="2"><tr><td class="code">
@@ -5237,7 +5237,7 @@ $spec)</code>
   </div>
   <hr />
 	<a name="methodrsDataLength"></a>
-	<h3>method rsDataLength <span class="smalllinenumber">[line 2675]</span></h3>
+	<h3>method rsDataLength <span class="smalllinenumber">[line 2687]</span></h3>
 	<div class="function">
     <table width="90%" border="0" cellspacing="0" cellpadding="1"><tr><td class="code_border">
     <table width="100%" border="0" cellspacing="0" cellpadding="2"><tr><td class="code">
@@ -5276,7 +5276,7 @@ $spec)</code>
   </div>
   <hr />
 	<a name="methodrsEccCodes1"></a>
-	<h3>method rsEccCodes1 <span class="smalllinenumber">[line 2639]</span></h3>
+	<h3>method rsEccCodes1 <span class="smalllinenumber">[line 2651]</span></h3>
 	<div class="function">
     <table width="90%" border="0" cellspacing="0" cellpadding="1"><tr><td class="code_border">
     <table width="100%" border="0" cellspacing="0" cellpadding="2"><tr><td class="code">
@@ -5315,7 +5315,7 @@ $spec)</code>
   </div>
   <hr />
 	<a name="methodrsEccCodes2"></a>
-	<h3>method rsEccCodes2 <span class="smalllinenumber">[line 2666]</span></h3>
+	<h3>method rsEccCodes2 <span class="smalllinenumber">[line 2678]</span></h3>
 	<div class="function">
     <table width="90%" border="0" cellspacing="0" cellpadding="1"><tr><td class="code_border">
     <table width="100%" border="0" cellspacing="0" cellpadding="2"><tr><td class="code">
@@ -5354,7 +5354,7 @@ $spec)</code>
   </div>
   <hr />
 	<a name="methodrsEccLength"></a>
-	<h3>method rsEccLength <span class="smalllinenumber">[line 2684]</span></h3>
+	<h3>method rsEccLength <span class="smalllinenumber">[line 2696]</span></h3>
 	<div class="function">
     <table width="90%" border="0" cellspacing="0" cellpadding="1"><tr><td class="code_border">
     <table width="100%" border="0" cellspacing="0" cellpadding="2"><tr><td class="code">
@@ -5393,7 +5393,7 @@ $spec)</code>
   </div>
   <hr />
 	<a name="methodsetFrameAt"></a>
-	<h3>method setFrameAt <span class="smalllinenumber">[line 791]</span></h3>
+	<h3>method setFrameAt <span class="smalllinenumber">[line 794]</span></h3>
 	<div class="function">
     <table width="90%" border="0" cellspacing="0" cellpadding="1"><tr><td class="code_border">
     <table width="100%" border="0" cellspacing="0" cellpadding="2"><tr><td class="code">
@@ -5435,7 +5435,7 @@ $val)</code>
   </div>
   <hr />
 	<a name="methodsplitString"></a>
-	<h3>method splitString <span class="smalllinenumber">[line 1449]</span></h3>
+	<h3>method splitString <span class="smalllinenumber">[line 1452]</span></h3>
 	<div class="function">
     <table width="90%" border="0" cellspacing="0" cellpadding="1"><tr><td class="code_border">
     <table width="100%" border="0" cellspacing="0" cellpadding="2"><tr><td class="code">
@@ -5460,7 +5460,7 @@ $val)</code>
   </div>
   <hr />
 	<a name="methodtoUpper"></a>
-	<h3>method toUpper <span class="smalllinenumber">[line 1490]</span></h3>
+	<h3>method toUpper <span class="smalllinenumber">[line 1493]</span></h3>
 	<div class="function">
     <table width="90%" border="0" cellspacing="0" cellpadding="1"><tr><td class="code_border">
     <table width="100%" border="0" cellspacing="0" cellpadding="2"><tr><td class="code">
@@ -5485,7 +5485,7 @@ $val)</code>
   </div>
   <hr />
 	<a name="methodwriteFormatInformation"></a>
-	<h3>method writeFormatInformation <span class="smalllinenumber">[line 946]</span></h3>
+	<h3>method writeFormatInformation <span class="smalllinenumber">[line 949]</span></h3>
 	<div class="function">
     <table width="90%" border="0" cellspacing="0" cellpadding="1"><tr><td class="code_border">
     <table width="100%" border="0" cellspacing="0" cellpadding="2"><tr><td class="code">
@@ -5551,7 +5551,7 @@ $frame)</code>
 
         <div class="credit">
 		    <hr />
-		    Documentation generated on Thu, 26 Aug 2010 16:10:45 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
+		    Documentation generated on Mon, 30 Aug 2010 17:41:47 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
 	      </div>
       </td></tr></table>
     </td>
diff --git a/doc/com-tecnick-tcpdf/TCPDF.html b/doc/com-tecnick-tcpdf/TCPDF.html
index 8a467b9..b64e595 100644
--- a/doc/com-tecnick-tcpdf/TCPDF.html
+++ b/doc/com-tecnick-tcpdf/TCPDF.html
@@ -83,7 +83,7 @@ Source Location: /tcpdf.php<br /><br />
                 
 <h4>Version:</h4>
 <ul>
-  <li>5.8.020</li>
+  <li>5.8.021</li>
 </ul>
 
         
@@ -747,7 +747,7 @@ This is a PHP class for generating PDF documents without requiring external exte
     <td><b>author:</b>&nbsp;&nbsp;</td><td>Nicola Asuni - info@tecnick.com</td>
   </tr>
   <tr>
-    <td><b>version:</b>&nbsp;&nbsp;</td><td>5.8.020</td>
+    <td><b>version:</b>&nbsp;&nbsp;</td><td>5.8.021</td>
   </tr>
   <tr>
     <td><b>link:</b>&nbsp;&nbsp;</td><td><a href="http://www.tcpdf.org">http://www.tcpdf.org</a></td>
@@ -26915,7 +26915,7 @@ $file)</code>
 
         <div class="credit">
 		    <hr />
-		    Documentation generated on Thu, 26 Aug 2010 16:10:46 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
+		    Documentation generated on Mon, 30 Aug 2010 17:41:48 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
 	      </div>
       </td></tr></table>
     </td>
diff --git a/doc/com-tecnick-tcpdf/TCPDF2DBarcode.html b/doc/com-tecnick-tcpdf/TCPDF2DBarcode.html
index b9c797a..7f993a4 100644
--- a/doc/com-tecnick-tcpdf/TCPDF2DBarcode.html
+++ b/doc/com-tecnick-tcpdf/TCPDF2DBarcode.html
@@ -299,7 +299,7 @@ $type)</code>
 
         <div class="credit">
 		    <hr />
-		    Documentation generated on Thu, 26 Aug 2010 16:10:44 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
+		    Documentation generated on Mon, 30 Aug 2010 17:41:46 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
 	      </div>
       </td></tr></table>
     </td>
diff --git a/doc/com-tecnick-tcpdf/TCPDFBarcode.html b/doc/com-tecnick-tcpdf/TCPDFBarcode.html
index 178f8ef..1b618f8 100644
--- a/doc/com-tecnick-tcpdf/TCPDFBarcode.html
+++ b/doc/com-tecnick-tcpdf/TCPDFBarcode.html
@@ -1377,7 +1377,7 @@ $type)</code>
 
         <div class="credit">
 		    <hr />
-		    Documentation generated on Thu, 26 Aug 2010 16:10:45 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
+		    Documentation generated on Mon, 30 Aug 2010 17:41:46 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
 	      </div>
       </td></tr></table>
     </td>
diff --git a/doc/com-tecnick-tcpdf/_2dbarcodes.php.html b/doc/com-tecnick-tcpdf/_2dbarcodes.php.html
index cdb8f29..c281c43 100644
--- a/doc/com-tecnick-tcpdf/_2dbarcodes.php.html
+++ b/doc/com-tecnick-tcpdf/_2dbarcodes.php.html
@@ -105,7 +105,7 @@ PHP class to creates array representations for 2D barcodes to be used with TCPDF
 
         <div class="credit">
 		    <hr />
-		    Documentation generated on Thu, 26 Aug 2010 16:10:44 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
+		    Documentation generated on Mon, 30 Aug 2010 17:41:46 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
 	      </div>
       </td></tr></table>
     </td>
diff --git a/doc/com-tecnick-tcpdf/_barcodes.php.html b/doc/com-tecnick-tcpdf/_barcodes.php.html
index 72ce973..e065bee 100644
--- a/doc/com-tecnick-tcpdf/_barcodes.php.html
+++ b/doc/com-tecnick-tcpdf/_barcodes.php.html
@@ -105,7 +105,7 @@ PHP class to creates array representations for common 1D barcodes to be used wit
 
         <div class="credit">
 		    <hr />
-		    Documentation generated on Thu, 26 Aug 2010 16:10:45 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
+		    Documentation generated on Mon, 30 Aug 2010 17:41:46 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
 	      </div>
       </td></tr></table>
     </td>
diff --git a/doc/com-tecnick-tcpdf/_config---tcpdf_config.php.html b/doc/com-tecnick-tcpdf/_config---tcpdf_config.php.html
index fdce013..821be23 100644
--- a/doc/com-tecnick-tcpdf/_config---tcpdf_config.php.html
+++ b/doc/com-tecnick-tcpdf/_config---tcpdf_config.php.html
@@ -542,7 +542,7 @@ Configuration file for TCPDF.<br /><br /><br /><br />
 
         <div class="credit">
 		    <hr />
-		    Documentation generated on Thu, 26 Aug 2010 16:10:51 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
+		    Documentation generated on Mon, 30 Aug 2010 17:41:52 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
 	      </div>
       </td></tr></table>
     </td>
diff --git a/doc/com-tecnick-tcpdf/_htmlcolors.php.html b/doc/com-tecnick-tcpdf/_htmlcolors.php.html
index 62d4cef..dc5495f 100644
--- a/doc/com-tecnick-tcpdf/_htmlcolors.php.html
+++ b/doc/com-tecnick-tcpdf/_htmlcolors.php.html
@@ -97,7 +97,7 @@ Array of WEB safe colors.<br /><br /><br /><br />
 
         <div class="credit">
 		    <hr />
-		    Documentation generated on Thu, 26 Aug 2010 16:10:45 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
+		    Documentation generated on Mon, 30 Aug 2010 17:41:47 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
 	      </div>
       </td></tr></table>
     </td>
diff --git a/doc/com-tecnick-tcpdf/_pdf417.php.html b/doc/com-tecnick-tcpdf/_pdf417.php.html
index 155807f..18e7094 100644
--- a/doc/com-tecnick-tcpdf/_pdf417.php.html
+++ b/doc/com-tecnick-tcpdf/_pdf417.php.html
@@ -157,7 +157,7 @@ Class to create PDF417 barcode arrays for TCPDF class.<br /><br /><p>PDF417 (ISO
 
         <div class="credit">
 		    <hr />
-		    Documentation generated on Thu, 26 Aug 2010 16:10:45 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
+		    Documentation generated on Mon, 30 Aug 2010 17:41:47 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
 	      </div>
       </td></tr></table>
     </td>
diff --git a/doc/com-tecnick-tcpdf/_qrcode.php.html b/doc/com-tecnick-tcpdf/_qrcode.php.html
index 707fcb8..3f1dc96 100644
--- a/doc/com-tecnick-tcpdf/_qrcode.php.html
+++ b/doc/com-tecnick-tcpdf/_qrcode.php.html
@@ -82,7 +82,7 @@ Class to create QR-code arrays for TCPDF class.<br /><br /><p>QR Code symbol is
     <td><b>author:</b>&nbsp;&nbsp;</td><td>Nicola Asuni</td>
   </tr>
   <tr>
-    <td><b>version:</b>&nbsp;&nbsp;</td><td>1.0.005</td>
+    <td><b>version:</b>&nbsp;&nbsp;</td><td>1.0.006</td>
   </tr>
   <tr>
     <td><b>copyright:</b>&nbsp;&nbsp;</td><td>2010-2010 Nicola Asuni - Tecnick.com S.r.l (www.tecnick.com) Via Della Pace, 11 - 09044 - Quartucciu (CA) - ITALY - www.tecnick.com - info@tecnick.com</td>
@@ -480,7 +480,7 @@ string $string, [int $split_length = 1])</code>
 
         <div class="credit">
 		    <hr />
-		    Documentation generated on Thu, 26 Aug 2010 16:10:45 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
+		    Documentation generated on Mon, 30 Aug 2010 17:41:47 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
 	      </div>
       </td></tr></table>
     </td>
diff --git a/doc/com-tecnick-tcpdf/_tcpdf.php.html b/doc/com-tecnick-tcpdf/_tcpdf.php.html
index e7df255..0faebc9 100644
--- a/doc/com-tecnick-tcpdf/_tcpdf.php.html
+++ b/doc/com-tecnick-tcpdf/_tcpdf.php.html
@@ -82,7 +82,7 @@ This is a PHP class for generating PDF documents without requiring external exte
     <td><b>author:</b>&nbsp;&nbsp;</td><td>Nicola Asuni</td>
   </tr>
   <tr>
-    <td><b>version:</b>&nbsp;&nbsp;</td><td>5.8.020</td>
+    <td><b>version:</b>&nbsp;&nbsp;</td><td>5.8.021</td>
   </tr>
   <tr>
     <td><b>copyright:</b>&nbsp;&nbsp;</td><td>2002-2010 Nicola Asuni - Tecnick.com S.r.l (www.tecnick.com) Via Della Pace, 11 - 09044 - Quartucciu (CA) - ITALY - www.tecnick.com - info@tecnick.com</td>
@@ -113,7 +113,7 @@ unicode data<br /><br /></div>
 	<div class="tags">
     <table width="90%" border="0" cellspacing="0" cellpadding="1"><tr><td class="code_border">
     <table width="100%" border="0" cellspacing="0" cellpadding="2"><tr><td class="code">
-		<code>PDF_PRODUCER = 'TCPDF 5.8.020 (http://www.tcpdf.org)'</code>
+		<code>PDF_PRODUCER = 'TCPDF 5.8.021 (http://www.tcpdf.org)'</code>
     </td></tr></table>
     </td></tr></table>
 
@@ -124,7 +124,7 @@ unicode data<br /><br /></div>
 
         <div class="credit">
 		    <hr />
-		    Documentation generated on Thu, 26 Aug 2010 16:10:46 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
+		    Documentation generated on Mon, 30 Aug 2010 17:41:48 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
 	      </div>
       </td></tr></table>
     </td>
diff --git a/doc/com-tecnick-tcpdf/_unicode_data.php.html b/doc/com-tecnick-tcpdf/_unicode_data.php.html
index f779f71..d938ad6 100644
--- a/doc/com-tecnick-tcpdf/_unicode_data.php.html
+++ b/doc/com-tecnick-tcpdf/_unicode_data.php.html
@@ -246,7 +246,7 @@ Unicode data for TCPDF library.<br /><br /><br /><br />
 
         <div class="credit">
 		    <hr />
-		    Documentation generated on Thu, 26 Aug 2010 16:10:51 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
+		    Documentation generated on Mon, 30 Aug 2010 17:41:52 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
 	      </div>
       </td></tr></table>
     </td>
diff --git a/doc/elementindex.html b/doc/elementindex.html
index f2c6ace..9855560 100644
--- a/doc/elementindex.html
+++ b/doc/elementindex.html
@@ -2056,7 +2056,7 @@
 	<a href="elementindex.html#top">top</a><br>
         <div class="credit">
 		    <hr />
-		    Documentation generated on Thu, 26 Aug 2010 16:10:44 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
+		    Documentation generated on Mon, 30 Aug 2010 17:41:46 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
 	      </div>
       </td></tr></table>
     </td>
diff --git a/doc/elementindex_com-tecnick-tcpdf.html b/doc/elementindex_com-tecnick-tcpdf.html
index c520212..0b9a85f 100644
--- a/doc/elementindex_com-tecnick-tcpdf.html
+++ b/doc/elementindex_com-tecnick-tcpdf.html
@@ -2088,7 +2088,7 @@
 	<a href="elementindex_com-tecnick-tcpdf.html#top">top</a><br>
         <div class="credit">
 		    <hr />
-		    Documentation generated on Thu, 26 Aug 2010 16:10:44 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
+		    Documentation generated on Mon, 30 Aug 2010 17:41:46 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
 	      </div>
       </td></tr></table>
     </td>
diff --git a/doc/errors.html b/doc/errors.html
index c5e751e..b567f93 100644
--- a/doc/errors.html
+++ b/doc/errors.html
@@ -35,7 +35,7 @@
 <a href="#Post-parsing">Post-parsing</a><br>
         <div class="credit">
 		    <hr />
-		    Documentation generated on Thu, 26 Aug 2010 16:10:51 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
+		    Documentation generated on Mon, 30 Aug 2010 17:41:52 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
 	      </div>
       </td></tr></table>
     </td>
diff --git a/doc/index.html b/doc/index.html
index 127d62f..cf23eea 100644
--- a/doc/index.html
+++ b/doc/index.html
@@ -67,7 +67,7 @@
 This documentation was generated by <a href="http://www.phpdoc.org">phpDocumentor v1.4.3</a><br />
         <div class="credit">
 		    <hr />
-		    Documentation generated on Thu, 26 Aug 2010 16:10:44 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
+		    Documentation generated on Mon, 30 Aug 2010 17:41:46 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
 	      </div>
       </td></tr></table>
     </td>
diff --git a/doc/li_com-tecnick-tcpdf.html b/doc/li_com-tecnick-tcpdf.html
index 127d62f..cf23eea 100644
--- a/doc/li_com-tecnick-tcpdf.html
+++ b/doc/li_com-tecnick-tcpdf.html
@@ -67,7 +67,7 @@
 This documentation was generated by <a href="http://www.phpdoc.org">phpDocumentor v1.4.3</a><br />
         <div class="credit">
 		    <hr />
-		    Documentation generated on Thu, 26 Aug 2010 16:10:44 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
+		    Documentation generated on Mon, 30 Aug 2010 17:41:46 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
 	      </div>
       </td></tr></table>
     </td>
diff --git a/fonts/stsongstdlight.php b/fonts/stsongstdlight.php
index 1d03215..1c74c62 100755
--- a/fonts/stsongstdlight.php
+++ b/fonts/stsongstdlight.php
@@ -34,6 +34,6 @@ $cw = array(
 	92 => 333, 93 => 374, 94 => 606, 95 => 500, 96 => 239, 97 => 417, 98 => 503, 99 => 427, 100 => 529, 101 => 415,
 	102 => 264, 103 => 444, 104 => 518, 105 => 241, 106 => 230, 107 => 495, 108 => 228, 109 => 793, 110 => 527, 111 => 524,
 	112 => 524, 113 => 504, 114 => 338, 115 => 336, 116 => 277, 117 => 517, 118 => 450, 119 => 652, 120 => 466, 121 => 452,
-	122 => 407, 123 => 370, 124 => 258, 125 => 370, 126 => 605,
+	122 => 407, 123 => 370, 124 => 258, 125 => 370, 126 => 605
 );
 // --- EOF ---
diff --git a/fonts/utils/README.TXT b/fonts/utils/README.TXT
index 103ac31..96d39fb 100755
--- a/fonts/utils/README.TXT
+++ b/fonts/utils/README.TXT
@@ -109,7 +109,7 @@ Setting up a font for usage with TCPDF requires the following steps:
                       + // Chinese Simplified
                         $enc='UniCNS-UTF16-H';
                         $cidinfo=array('Registry'=>'Adobe', 'Ordering'=>'CNS1','Supplement'=>0);
-                        include(dirname(__FILE__).'/uni2cid_ac16.php');
+                        include(dirname(__FILE__).'/uni2cid_ac15.php');
 
                       + // Chinese Traditional
                         $enc='UniGB-UTF16-H';
diff --git a/qrcode.php b/qrcode.php
index 564a3ca..636b07e 100644
--- a/qrcode.php
+++ b/qrcode.php
@@ -1,9 +1,9 @@
 <?php
 //============================================================+
 // File name   : qrcode.php
-// Version     : 1.0.005
+// Version     : 1.0.006
 // Begin       : 2010-03-22
-// Last Update : 2010-08-08
+// Last Update : 2010-08-30
 // Author      : Nicola Asuni - Tecnick.com S.r.l - Via Della Pace, 11 - 09044 - Quartucciu (CA) - ITALY - www.tecnick.com - info@tecnick.com
 // License     : GNU-LGPL v3 (http://www.gnu.org/copyleft/lesser.html)
 // -------------------------------------------------------------------
@@ -79,7 +79,7 @@
  * @copyright 2010-2010 Nicola Asuni - Tecnick.com S.r.l (www.tecnick.com) Via Della Pace, 11 - 09044 - Quartucciu (CA) - ITALY - www.tecnick.com - info@tecnick.com
  * @link http://www.tcpdf.org
  * @license http://www.gnu.org/copyleft/lesser.html LGPL
- * @version 1.0.005
+ * @version 1.0.006
  */
 
 // definitions
@@ -295,7 +295,7 @@ if (!class_exists('QRcode', false)) {
 	 * @copyright 2010-2010 Nicola Asuni - Tecnick.com S.r.l (www.tecnick.com) Via Della Pace, 11 - 09044 - Quartucciu (CA) - ITALY - www.tecnick.com - info@tecnick.com
 	 * @link http://www.tcpdf.org
 	 * @license http://www.gnu.org/copyleft/lesser.html LGPL
-	 * @version 1.0.005
+	 * @version 1.0.006
 	 */
 	class QRcode {
 
@@ -663,6 +663,9 @@ if (!class_exists('QRcode', false)) {
 			}
 			$this->items = array();
 			$this->encodeString($code);
+			if (is_null($this->data)) {
+				return false;
+			}
 			$qrTab = $this->binarize($this->data);
 			$size = count($qrTab);
 			$barcode_array['num_rows'] = $size;
@@ -2060,6 +2063,9 @@ if (!class_exists('QRcode', false)) {
 		 * @return array bitstream
 		 */
 		 protected function appendPaddingBit($bstream) {
+		 	if (is_null($bstream)) {
+		 		return null;
+		 	}
 			$bits = count($bstream);
 			$maxwords = $this->getDataLength($this->version, $this->level);
 			$maxbits = $maxwords * 8;
@@ -2091,6 +2097,9 @@ if (!class_exists('QRcode', false)) {
 		 */
 		 protected function mergeBitStream($items) {
 			$items = $this->convertData($items);
+			if (!is_array($items)) {
+				return null;
+			}
 			$bstream = array();
 			foreach ($items as $item) {
 				$bstream = $this->appendBitstream($bstream, $item['bstream']);
@@ -2227,6 +2236,9 @@ if (!class_exists('QRcode', false)) {
 		 * @return array of bytes
 		 */
 		 protected function bitstreamToByte($bstream) {
+			if (is_null($bstream)) {
+		 		return null;
+		 	}
 			$size = count($bstream);
 			if ($size == 0) {
 				return array();
diff --git a/tcpdf.php b/tcpdf.php
index cc0490c..cfa1585 100755
--- a/tcpdf.php
+++ b/tcpdf.php
@@ -1,9 +1,9 @@
 <?php
 //============================================================+
 // File name   : tcpdf.php
-// Version     : 5.8.020
+// Version     : 5.8.021
 // Begin       : 2002-08-03
-// Last Update : 2010-08-26
+// Last Update : 2010-08-30
 // Author      : Nicola Asuni - Tecnick.com S.r.l - Via Della Pace, 11 - 09044 - Quartucciu (CA) - ITALY - www.tecnick.com - info@tecnick.com
 // License     : GNU-LGPL v3 (http://www.gnu.org/copyleft/lesser.html)
 // -------------------------------------------------------------------
@@ -128,7 +128,7 @@
  * @copyright 2002-2010 Nicola Asuni - Tecnick.com S.r.l (www.tecnick.com) Via Della Pace, 11 - 09044 - Quartucciu (CA) - ITALY - www.tecnick.com - info@tecnick.com
  * @link http://www.tcpdf.org
  * @license http://www.gnu.org/copyleft/lesser.html LGPL
- * @version 5.8.020
+ * @version 5.8.021
  */
 
 /**
@@ -152,14 +152,14 @@ if (!class_exists('TCPDF', false)) {
 	/**
 	 * define default PDF document producer
 	 */
-	define('PDF_PRODUCER', 'TCPDF 5.8.020 (http://www.tcpdf.org)');
+	define('PDF_PRODUCER', 'TCPDF 5.8.021 (http://www.tcpdf.org)');
 
 	/**
 	* This is a PHP class for generating PDF documents without requiring external extensions.<br>
 	* 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>
 	* @name TCPDF
 	* @package com.tecnick.tcpdf
-	* @version 5.8.020
+	* @version 5.8.021
 	* @author Nicola Asuni - info@tecnick.com
 	* @link http://www.tcpdf.org
 	* @license http://www.gnu.org/copyleft/lesser.html LGPL
@@ -16352,7 +16352,7 @@ if (!class_exists('TCPDF', false)) {
 			// create new barcode object
 			$barcodeobj = new TCPDF2DBarcode($code, $type);
 			$arrcode = $barcodeobj->getBarcodeArray();
-			if ($arrcode === false) {
+			if (($arrcode === false) OR empty($arrcode)) {
 				$this->Error('Error in 2D barcode string');
 			}
 			// set default values
@@ -18498,11 +18498,11 @@ if (!class_exists('TCPDF', false)) {
 					} else {
 						$pask = 0;
 					}
-					if ($dom[$key]['tag'] AND $dom[$key]['opening'] AND ($dom[$key]['value'] == 'table')) {
+					if (!($dom[$key]['tag'] AND !$dom[$key]['opening'] AND ($dom[$key]['value'] == 'table') AND ($this->emptypagemrk[$this->page] == $this->pagelen[$this->page]))) {
 						$this->SetFont($fontname, $fontstyle, $fontsize);
-					}
-					if ($wfill) {
-						$this->SetFillColorArray($this->bgcolor);
+						if ($wfill) {
+							$this->SetFillColorArray($this->bgcolor);
+						}
 					}
 				} // end newline
 				if (isset($opentagpos)) {