Merge pull request #35 from Wuisch/dirk

Merge Dirk
Merge branch 'master' into dirk