Convention fix
Composer
Merge branch 'bugFix'