Overriden timestampable listener
Merge pull request #561 from stefk/timestamp-listener

Overriden timestampable listener