Merge pull request #6 from dbeyer/master

Update of TimeStamp