implemented cosmetic fixes
Merge branch 'master' of github.com:mpanibrat/Generator into timestamps