Add name to composer
Merge branch 'master' into develop
Resolving circular dependencies