Merge branch 'master' into DIRK
Index is html again
Merge pull request #3 from jannah/DIRK

Dirk