Fix for the date/time stamp. Also, dropping some whitespace.
Merge branch 'develop'