Fixes Issue 4

Timestamp also implemented