Feature/uglify