Merge branch 'feature/composer-support' into master