Merge pull request #4 from jalet/develop

Yeoman generater 0.18
Merge pull request #5 from jalet/master

Merge pull request #4 from jalet/develop