Work on minor stuff
Merge branch 'master' into dirk
Merge pull request #42 from Wuisch/dirk

Dirk