change to timestamp
Merge pull request #81 from anilsaldhana/master

see comments