Merge remote-tracking branch 'EvanDotPro/feature/composer-optional'