Merge branch 'master' of https://github.com/vladimirf7/generator
Merge branch 'master' of https://github.com/vladimirf7/generator