Merge pull request #26 from ChristianGruen/master

Time and date updated