Add composer
Merge branch 'features'