Add example: timestamp
Merge branch 'master' into timestamp