Merge pull request #13 from JO0st/master

fix bug in timestamp