Add support for minification
Revisions for minification
Fix conflicts