[FIXING] Composer
Merge branch 'master' into beta