Feature/uglifyjs