Add timestamp method and use it on summary
Merge branch 'feature/timestamp' into develop