diff --git a/README.html b/README.html
index ed9e88a..36cfa82 100644
--- a/README.html
+++ b/README.html
@@ -11,7 +11,7 @@ blockquote { background: #eeeeee; }
 <h1>PDFMiner</h1>
 <div align=right class=lastmod>
 <!-- hhmts start -->
-Last Modified: Thu Jul 10 00:16:52 JST 2008
+Last Modified: Thu Jul 10 00:18:46 JST 2008
 <!-- hhmts end -->
 </div>
 
@@ -228,7 +228,8 @@ no stream header is displayed for the ease of saving it to a file.
 <hr noshade>
 <h2>Changes</h2>
 <ul>
-<li> 2008/06/29: Added HTML output. Reorganized the directory structure.
+<li> 2008/07/10: Outline (TOC) extraction support.
+<li> 2008/06/29: HTML output added. Reorganized the directory structure.
 <li> 2008/04/29: Bugfix for Win32. Thanks to Chris Clark.
 <li> 2008/04/27: Basic encryption and LZW decoding support added.
 <li> 2008/01/07: Several bugfixes. Thanks to Nick Fabry for his contribution.
diff --git a/TODO b/TODO
index 9b12f11..17c34b2 100644
--- a/TODO
+++ b/TODO
@@ -1,8 +1,8 @@
 TODOs:
   - Documentation.
   - Error handling for invalid type.
+  - Tagged PDF.
+  - Infer text stream by clustering.
 
-  - Outlines.
-  - Named Objects. (pages)
   - Support writing/creating PDFs.
   - Any special treatments for linearized PDFs?
diff --git a/pdflib/pdfparser.py b/pdflib/pdfparser.py
index 39a286f..b2b1509 100755
--- a/pdflib/pdfparser.py
+++ b/pdflib/pdfparser.py
@@ -726,6 +726,7 @@ class PDFParser(PSStackParser):
           break
         objlen += len(line)
         data += line
+      self.seek(pos+objlen)
       if 1 <= self.debug:
         print >>stderr, 'Stream: pos=%d, objlen=%d, dic=%r, data=%r...' % \
               (pos, objlen, dic, data[:10])
diff --git a/pdflib/psparser.py b/pdflib/psparser.py
index 8450c14..d8a48bc 100644
--- a/pdflib/psparser.py
+++ b/pdflib/psparser.py
@@ -139,7 +139,7 @@ class PSBaseParser(object):
     return
   
   def tell(self):
-    return self.fp.tell()
+    return self.bufpos+self.charpos
 
   def poll(self, pos=None, n=80):
     pos0 = self.fp.tell()