add composer
Merge branch 'feature/composer' into develop