Merge pull request #1 from mpanibrat/timestamps

added timestamps feature, adjusted generation structure
implemented cosmetic fixes
Merge branch 'master' of github.com:mpanibrat/Generator into timestamps