Fix #2 and #2: support CSS and Javascript merge