Merge pull request #80 from svetlemodry/svetlemodry-datestamp-fix