Yet to be tested!! Will do later!
closes #6
Merge pull request #11 from psycholold/6-timestamp

6 timestamp