Merge remote-tracking branch 'SpiffyJr/feature/composer'