added stuff from yeoman
added stuff from yeoman