diff --git a/gulp/tasks/bootstrap.js b/gulp/tasks/bootstrap.js
index 9366b4ff1..a263691ef 100644
--- a/gulp/tasks/bootstrap.js
+++ b/gulp/tasks/bootstrap.js
@@ -3,6 +3,7 @@ var gulp = require('gulp'),
   minifyHtml = require('gulp-minify-html'),
   templateCache = require('gulp-angular-templatecache'),
   concat = require('gulp-concat'),
+  rename = require('gulp-rename'),
   uglify = require('gulp-uglify');
 
 gulp.task('bootstrap', function() {
@@ -22,8 +23,10 @@ gulp.task('bootstrap', function() {
   stream.queue(gulp.src('./src/directives/decorators/bootstrap/*.js'));
 
   stream.done()
-  .pipe(concat('bootstrap-decorator.min.js'))
+  .pipe(concat('bootstrap-decorator.js'))
+  .pipe(gulp.dest('./dist/'))
   .pipe(uglify())
+  .pipe(rename('bootstrap-decorator.min.js'))
   .pipe(gulp.dest('./dist/'));
 
-});
\ No newline at end of file
+});
diff --git a/gulp/tasks/default.js b/gulp/tasks/default.js
index f50183f47..b5ee304c8 100644
--- a/gulp/tasks/default.js
+++ b/gulp/tasks/default.js
@@ -3,6 +3,5 @@ var gulp = require('gulp');
 gulp.task('default', [
   'minify',
   'bootstrap',
-  'bootstrap-datepicker',
-  'non-minified-dist'
-]);
\ No newline at end of file
+  'bootstrap-datepicker'
+]);
diff --git a/gulp/tasks/minify.js b/gulp/tasks/minify.js
index 73f86cb1e..afe2512cb 100644
--- a/gulp/tasks/minify.js
+++ b/gulp/tasks/minify.js
@@ -1,5 +1,6 @@
 var gulp = require('gulp'),
   concat = require('gulp-concat'),
+  rename = require('gulp-rename'),
   uglify = require('gulp-uglify');
 
 gulp.task('minify', function() {
@@ -9,7 +10,9 @@ gulp.task('minify', function() {
     './src/services/*.js',
     './src/directives/*.js'
     ])
-  .pipe(concat('schema-form.min.js'))
+  .pipe(concat('schema-form.js'))
+  .pipe(gulp.dest('./dist/'))
   .pipe(uglify())
+  .pipe(rename('schema-form.min.js'))
   .pipe(gulp.dest('./dist/'));
 });
diff --git a/gulp/tasks/non-minified-dist.js b/gulp/tasks/non-minified-dist.js
deleted file mode 100644
index 521f4c5ee..000000000
--- a/gulp/tasks/non-minified-dist.js
+++ /dev/null
@@ -1,13 +0,0 @@
-var gulp = require('gulp'),
-  concat = require('gulp-concat');
-
-gulp.task('non-minified-dist', function() {
-  gulp.src([
-    './src/module.js',
-    './src/sfPath.js',
-    './src/services/*.js',
-    './src/directives/*.js'
-  ])
-  .pipe(concat('schema-form.js'))
-  .pipe(gulp.dest('./dist/'));
-});
\ No newline at end of file
diff --git a/package.json b/package.json
index 17202dfcb..54f47a045 100644
--- a/package.json
+++ b/package.json
@@ -37,6 +37,7 @@
     "gulp-concat": "^2.2.0",
     "gulp-jscs": "^1.1.0",
     "gulp-minify-html": "^0.1.1",
+    "gulp-rename": "^1.2.0",
     "gulp-uglify": "^0.2.1",
     "karma": "^0.12.0",
     "karma-chai-sinon": "^0.1.3",
@@ -51,10 +52,10 @@
     "sinon-chai": "^2.5.0",
     "streamqueue": "0.0.5"
   },
-"licenses": [
-  {
-    "type": "MIT",
-    "url": "https://raw.githubusercontent.com/Textalk/angular-schema-form/master/LICENSE"
-  }
-]
+  "licenses": [
+    {
+      "type": "MIT",
+      "url": "https://raw.githubusercontent.com/Textalk/angular-schema-form/master/LICENSE"
+    }
+  ]
 }