Merge pull request #25 from ChristianGruen/master

Time and date updated
Time and date updated