diff --git a/README.md b/README.md
index 71ee4d78..68d0e308 100644
--- a/README.md
+++ b/README.md
@@ -131,6 +131,7 @@ This is a complete rewrite of the 0.5 version of Yjs. Since Yjs 1.0 it is possib
 * The Connector definition slightly changed (I'll update the wiki)
 * The Type definitions completely changed, so you have to rewrite them (I'll rewrite the article in the wiki)
 * Support for several packaging systems
+* Flowtype
 
 
 ## Contribution
diff --git a/declarations/Type.js b/declarations/Type.js
new file mode 100644
index 00000000..e69de29b
diff --git a/dist b/dist
index 14a3fbc6..b471c91d 160000
--- a/dist
+++ b/dist
@@ -1 +1 @@
-Subproject commit 14a3fbc638737b17478a426b542a3984cba22bc3
+Subproject commit b471c91d1d70b1d9e31ba81664d8fab4aff414a2
diff --git a/gulpfile.helper.js b/gulpfile.helper.js
index fd1ba8ed..aafa6980 100644
--- a/gulpfile.helper.js
+++ b/gulpfile.helper.js
@@ -1,6 +1,9 @@
 
 var $ = require('gulp-load-plugins')()
 var minimist = require('minimist')
+var browserify = require('browserify')
+var source = require('vinyl-source-stream')
+var buffer = require('vinyl-buffer')
 
 module.exports = function (gulp, helperOptions) {
   var runSequence = require('run-sequence').use(gulp)
@@ -31,21 +34,10 @@ module.exports = function (gulp, helperOptions) {
     files.dist = ['node_modules/regenerator/runtime.js', files.dist]
   }
 
-  gulp.task('dist', function () {
-    var browserify = require('browserify')
-    var source = require('vinyl-source-stream')
-    var buffer = require('vinyl-buffer')
-
-    var babelOptions
-    if (options.es6 || options.debug) {
-      babelOptions = {}
-    } else {
-      babelOptions = {
-        presets: ['es2015']
-      }
+  gulp.task('dist:es5', function () {
+    var babelOptions = {
+      presets: ['es2015']
     }
-
-    console.log(JSON.stringify(files.dist))
     return (browserify({
       entries: files.dist,
       debug: true
@@ -54,11 +46,30 @@ module.exports = function (gulp, helperOptions) {
       .pipe(source(options.targetName))
       .pipe(buffer())
       .pipe($.sourcemaps.init({loadMaps: true}))
-      .pipe($.if(!options.debug && !options.es6, $.uglify()))
+      .pipe($.uglify())
       .pipe($.sourcemaps.write('.'))
       .pipe(gulp.dest('./dist/')))
   })
 
+  gulp.task('dist:es6', function () {
+    return (browserify({
+      entries: files.dist,
+      debug: true
+    }).bundle()
+      .pipe(source(options.targetName))
+      .pipe(buffer())
+      .pipe($.sourcemaps.init({loadMaps: true}))
+      // .pipe($.uglify()) -- generators not yet supported see #448
+      .pipe($.rename({
+        extname: '.es6'
+      }))
+      .pipe($.sourcemaps.write('.'))
+
+      .pipe(gulp.dest('./dist/')))
+  })
+
+  gulp.task('dist', ['dist:es6', 'dist:es5'])
+
   gulp.task('watch:dist', function (cb) {
     options.debug = true
     gulp.src(['./README.md'])
diff --git a/package.json b/package.json
index a3ffc144..ecaadbe3 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "yjs",
-  "version": "0.6.41",
+  "version": "0.6.42",
   "description": "A framework for real-time p2p shared editing on arbitrary complex data types",
   "main": "y.js",
   "scripts": {
@@ -46,6 +46,7 @@
     "babel-preset-es2015": "^6.1.18",
     "babelify": "^7.2.0",
     "browserify": "^12.0.1",
+    "eslint": "^1.10.2",
     "gulp": "^3.9.0",
     "gulp-bump": "^1.0.0",
     "gulp-concat": "^2.6.0",
@@ -61,11 +62,12 @@
     "gulp-shell": "^0.5.1",
     "gulp-sourcemaps": "^1.5.2",
     "gulp-tag-version": "^1.3.0",
-    "gulp-uglify": "^1.4.2",
+    "gulp-uglify": "^1.5.1",
     "gulp-util": "^3.0.6",
     "gulp-watch": "^4.3.5",
     "minimist": "^1.2.0",
     "pre-commit": "^1.1.1",
+    "regenerator": "^0.8.42",
     "run-sequence": "^1.1.4",
     "standard": "^5.2.2",
     "vinyl-buffer": "^1.0.0",