Merge branch 'master' into DIRK
Fixed layout

The layout was a little bit off and I fixed that.
Merge pull request #14 from jannah/DIRK

Dirk