1st changes
Merge branch 'master' of https://github.com/netorious/generator