fixed
Merge branch 'hotfix/fix_composer'