added timestamps feature, adjusted generation structure
Merge pull request #1 from mpanibrat/timestamps

added timestamps feature, adjusted generation structure