Merge pull request #11 from jannah/DIRK

Dirk
Merge pull request #12 from jannah/DIRK

CSS
Merge branch 'master' into DIRK