Add TOC
Fix #654
Merge pull request #677 from emmanuel-keller/master

Fix #674