update to use component name instead of 'main' for assets
Merge remote-tracking branch 'origin/master'