Added support for minification