more work on TOC object
Merge pull request #265 from clovis/master

more work on TOC object