Start working on minor stuff
Merge branch 'master' into dirk
Merge pull request #36 from Wuisch/dirk

Merge Dirk