Fixed composer integration
Merge remote-tracking branch 'origin/develop'