diff --git a/.travis.yml b/.travis.yml
index 8282562..0dfa09a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -10,11 +10,9 @@ install:
 
 before_script:
   - npm install -g gulp
-  
-script: 
-  - gulp sass:compile
-  - gulp css:minify
-  
+
+script:
+  - gulp
+
 notifications:
   email: false
-
diff --git a/README.md b/README.md
index 79c3359..70f0483 100644
--- a/README.md
+++ b/README.md
@@ -40,7 +40,7 @@ or you can install the waffle grid system using a package manager like npm
 ```
 $ npm install waffel-grid
 ```
-If you want you can still download the waffle grid [here](https://github.com/lucasgruwez/waffle-grid/releases/download/v1.2.1/waffle-grid.min.css).
+If you want you can still download the waffle grid [here](https://github.com/lucasgruwez/waffle-grid/releases/download/v1.2.2/waffle-grid.min.css).
 
 ## Docs
 
@@ -92,7 +92,7 @@ Please read [CONTRIBUTING.md](./.github/CONTRIBUTING.md) for details on our code
 
 ## Versioning
 
-We use [SemVer](http://semver.org/) for versioning. For the versions available, see the [tags on this repository](https://github.com/lucasgruwez/waffle-grid/tags). 
+We use [SemVer](http://semver.org/) for versioning. For the versions available, see the [tags on this repository](https://github.com/lucasgruwez/waffle-grid/tags).
 
 ## Authors
 
diff --git a/dist/waffle-grid.css b/dist/waffle-grid.css
index 0c9d49b..82af62b 100644
--- a/dist/waffle-grid.css
+++ b/dist/waffle-grid.css
@@ -1,5 +1,5 @@
 /*!
- * waffle-grid - v1.2.1 - (https://lucasgruwez.github.io/waffle-grid)
+ * waffle-grid - v1.2.2 - (https://lucasgruwez.github.io/waffle-grid)
  * Copyright 2017 Lucas Gruwez.
  * Licensed under MIT
  * https://lucasgruwez.github.io/waffle-grid
diff --git a/dist/waffle-grid.min.css b/dist/waffle-grid.min.css
index 5b2f668..fd830fd 100644
--- a/dist/waffle-grid.min.css
+++ b/dist/waffle-grid.min.css
@@ -1,5 +1,5 @@
 /*!
- * waffle-grid - v1.2.1 - (https://lucasgruwez.github.io/waffle-grid)
+ * waffle-grid - v1.2.2 - (https://lucasgruwez.github.io/waffle-grid)
  * Copyright 2017 Lucas Gruwez.
  * Licensed under MIT
  * https://lucasgruwez.github.io/waffle-grid
diff --git a/docs/_config.yml b/docs/_config.yml
index c4c6b72..57478b7 100644
--- a/docs/_config.yml
+++ b/docs/_config.yml
@@ -10,8 +10,8 @@ url:          lucasgruwez.github.io
 baseurl:      /waffle-grid
 
 # Custom variables
-version:  v1.2.1
+version:  v1.2.2
 cdn:      https://unpkg.com/waffle-grid
 repo:     https://github.com/lucasgruwez/waffle-grid
-download: https://github.com/lucasgruwez/waffle-grid/releases/download/v1.2.1/waffle-grid.min.css
+download: https://github.com/lucasgruwez/waffle-grid/releases/download/v1.2.2/waffle-grid.min.css
 docs:     https://github.com/lucasgruwez/waffle-grid/wiki
diff --git a/gulpfile.js b/gulpfile.js
index bbd7a4e..80991e2 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -1,7 +1,9 @@
 const gulp = require('gulp');
 const sass = require('gulp-sass');
+const gutil = require('gulp-util');
 const rename = require('gulp-rename');
 const cleanCSS = require('gulp-clean-css');
+const runSequence = require('run-sequence');
 const cssbeautify = require('gulp-cssbeautify');
 const autoprefixer = require('gulp-autoprefixer');
 
@@ -11,11 +13,10 @@ gulp.task('sass:compile', function () {
     .pipe(cleanCSS({
       level: {
         1: {
-          all: true // controls all properties
+          all: true
         },
         2: {
           all: true,
-          mergeNonAdjacentByBody: true
         }
       }
     })) // This moight seem counter intuitive at first, that we first uglify then beautify, but the uglification drastically reduces file size by merging col-1-of-4, col-2-of-8 and col-3-of-12 ito one same rule. The beautyfication makes the code readable. This reduces the non-minified file size by ~200 lines.
@@ -29,10 +30,6 @@ gulp.task('sass:compile', function () {
     .pipe(gulp.dest('./dist'));
 });
 
-gulp.task('sass:watch', function () {
-  gulp.watch('./src/**/*.scss', ['sass']);
-});
-
 gulp.task('css:minify', function() {
   return gulp.src('dist/waffle-grid.css')
     .pipe(cleanCSS({compatibility: 'ie8'}))
@@ -40,4 +37,6 @@ gulp.task('css:minify', function() {
     .pipe(gulp.dest('dist'));
 });
 
-gulp.task('default', ['sass:compile', 'css:minify'])
+gulp.task('default', function () {
+  runSequence('sass:compile', 'css:minify');
+})
diff --git a/package.json b/package.json
index 896c9ad..52b55e2 100644
--- a/package.json
+++ b/package.json
@@ -1,8 +1,12 @@
 {
   "name": "waffle-grid",
-  "version": "1.2.1",
+  "version": "1.2.2",
   "description": "An easy to use flexbox grid system",
   "main": "dist/waffle-grid.min.css",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/lucasgruwez/waffle-grid"
+  },
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"
   },
@@ -19,6 +23,8 @@
     "gulp-clean-css": "^3.0.3",
     "gulp-cssbeautify": "^0.1.3",
     "gulp-rename": "^1.2.2",
-    "gulp-sass": "^3.1.0"
+    "gulp-sass": "^3.1.0",
+    "gulp-util": "^3.0.8",
+    "run-sequence": "^1.2.2"
   }
 }
diff --git a/src/waffle-grid.scss b/src/waffle-grid.scss
index 9a189bc..1efe358 100644
--- a/src/waffle-grid.scss
+++ b/src/waffle-grid.scss
@@ -1,5 +1,5 @@
 /*!
- * waffle-grid - v1.2.1 - (https://lucasgruwez.github.io/waffle-grid)
+ * waffle-grid - v1.2.2 - (https://lucasgruwez.github.io/waffle-grid)
  * Copyright 2017 Lucas Gruwez.
  * Licensed under MIT
  * https://lucasgruwez.github.io/waffle-grid