added name to the configuration
Merge branch 'master' into edge