Added changes made by matthiasdiener.
Fixes #7

Table of contents was improved, but is not yet correct.