Feature/fixing yeoman