Merge branch 'master' into DIRK
Fixed bug in the time

There was a new bug in the time, fixed it.
Merge pull request #11 from jannah/DIRK

Dirk