diff --git a/.jshintrc b/.jshintrc
index e8dff7e..79b981b 100644
--- a/.jshintrc
+++ b/.jshintrc
@@ -33,11 +33,9 @@
     "trailing"      : true,     // Prohibit trailing whitespaces.
     "maxparams"     : 8,        // Prohibit having more than X number of params in a function.
     "maxdepth"      : 8,        // Prohibit nested blocks from going more than X levels deep.
-    "maxstatements" : false,    // Restrict the number of statements in a function.
-    "maxcomplexity" : false,    // Restrict the cyclomatic complexity of the code.
     "maxlen"        : 220,      // Require that all lines are 100 characters or less.
     "globals"       : {         // Register globals that are used in the code.
-        "performance": false    // Depends on polyfill, simplifies usage
+        "performance": false   // Depends on polyfill, simplifies usage
     },
 
     // == Relaxing Options ================================================

diff --git a/.jshintrc b/.jshintrc
index e8dff7e..79b981b 100644
--- a/.jshintrc
+++ b/.jshintrc
@@ -33,11 +33,9 @@
     "trailing"      : true,     // Prohibit trailing whitespaces.
     "maxparams"     : 8,        // Prohibit having more than X number of params in a function.
     "maxdepth"      : 8,        // Prohibit nested blocks from going more than X levels deep.
-    "maxstatements" : false,    // Restrict the number of statements in a function.
-    "maxcomplexity" : false,    // Restrict the cyclomatic complexity of the code.
     "maxlen"        : 220,      // Require that all lines are 100 characters or less.
     "globals"       : {         // Register globals that are used in the code.
-        "performance": false    // Depends on polyfill, simplifies usage
+        "performance": false   // Depends on polyfill, simplifies usage
     },
 
     // == Relaxing Options ================================================
diff --git a/src/core/renderers/canvas/CanvasRenderer.js b/src/core/renderers/canvas/CanvasRenderer.js
index 8d6c465..7893cd2 100644
--- a/src/core/renderers/canvas/CanvasRenderer.js
+++ b/src/core/renderers/canvas/CanvasRenderer.js
@@ -239,7 +239,7 @@
             this.blendModes[CONST.BLEND_MODES.DIFFERENCE]    = 'difference';
             this.blendModes[CONST.BLEND_MODES.EXCLUSION]     = 'exclusion';
             this.blendModes[CONST.BLEND_MODES.HUE]           = 'hue';
-            this.blendModes[CONST.BLEND_MODES.SATURATION]    = 'saturation';
+            this.blendModes[CONST.BLEND_MODES.SATURATION]    = 'saturate';
             this.blendModes[CONST.BLEND_MODES.COLOR]         = 'color';
             this.blendModes[CONST.BLEND_MODES.LUMINOSITY]    = 'luminosity';
         }

diff --git a/.jshintrc b/.jshintrc
index e8dff7e..79b981b 100644
--- a/.jshintrc
+++ b/.jshintrc
@@ -33,11 +33,9 @@
     "trailing"      : true,     // Prohibit trailing whitespaces.
     "maxparams"     : 8,        // Prohibit having more than X number of params in a function.
     "maxdepth"      : 8,        // Prohibit nested blocks from going more than X levels deep.
-    "maxstatements" : false,    // Restrict the number of statements in a function.
-    "maxcomplexity" : false,    // Restrict the cyclomatic complexity of the code.
     "maxlen"        : 220,      // Require that all lines are 100 characters or less.
     "globals"       : {         // Register globals that are used in the code.
-        "performance": false    // Depends on polyfill, simplifies usage
+        "performance": false   // Depends on polyfill, simplifies usage
     },
 
     // == Relaxing Options ================================================
diff --git a/src/core/renderers/canvas/CanvasRenderer.js b/src/core/renderers/canvas/CanvasRenderer.js
index 8d6c465..7893cd2 100644
--- a/src/core/renderers/canvas/CanvasRenderer.js
+++ b/src/core/renderers/canvas/CanvasRenderer.js
@@ -239,7 +239,7 @@
             this.blendModes[CONST.BLEND_MODES.DIFFERENCE]    = 'difference';
             this.blendModes[CONST.BLEND_MODES.EXCLUSION]     = 'exclusion';
             this.blendModes[CONST.BLEND_MODES.HUE]           = 'hue';
-            this.blendModes[CONST.BLEND_MODES.SATURATION]    = 'saturation';
+            this.blendModes[CONST.BLEND_MODES.SATURATION]    = 'saturate';
             this.blendModes[CONST.BLEND_MODES.COLOR]         = 'color';
             this.blendModes[CONST.BLEND_MODES.LUMINOSITY]    = 'luminosity';
         }
diff --git a/src/filters/color/ColorMatrixFilter.js b/src/filters/color/ColorMatrixFilter.js
index 4c2aab8..d0e099b 100644
--- a/src/filters/color/ColorMatrixFilter.js
+++ b/src/filters/color/ColorMatrixFilter.js
@@ -3,7 +3,7 @@
 var fs = require('fs');
 
 /**
- * The ColorMatrixFilter class lets you apply a 5x5 matrix transformation on the RGBA
+ * The ColorMatrixFilter class lets you apply a 5x4 matrix transformation on the RGBA
  * color and alpha values of every pixel on your displayObject to produce a result
  * with a new set of RGBA color and alpha values. It's pretty powerful!
  *
@@ -26,11 +26,14 @@
         fs.readFileSync(__dirname + '/colorMatrix.frag', 'utf8'),
         // custom uniforms
         {
-            m: { type: '1fv', value: [1, 0, 0, 0, 0,
-                                    0, 1, 0, 0, 0,
-                                    0, 0, 1, 0, 0,
-                                    0, 0, 0, 1, 0,
-                                    0, 0, 0, 0, 1] }
+            m: {
+                type: '1fv', value: [
+                    1, 0, 0, 0, 0,
+                    0, 1, 0, 0, 0,
+                    0, 0, 1, 0, 0,
+                    0, 0, 0, 1, 0
+                ]
+            }
         }
     );
 }
@@ -43,17 +46,16 @@
 /**
  * Transforms current matrix and set the new one
  *
- * @param matrix {array} (mat 5x5)
+ * @param matrix {number[]} (mat 5x4)
  * @param multiply {boolean} if true, current matrix and matrix are multiplied. If false, just set the current matrix with @param matrix
  */
-ColorMatrixFilter.prototype._loadMatrix = function(matrix, multiply)
+ColorMatrixFilter.prototype._loadMatrix = function (matrix, multiply)
 {
     multiply = !!multiply;
 
     var newMatrix = matrix;
 
-    if(multiply)
-    {
+    if (multiply) {
         this._multiply(newMatrix, this.uniforms.m.value, matrix);
         newMatrix = this._colorMatrix(newMatrix);
     }
@@ -65,47 +67,41 @@
 /**
  * Multiplies two mat5's
  *
- * @param out {array} (mat 5x5) the receiving matrix
- * @param a {array} (mat 5x5) the first operand
- * @param b {array} (mat 5x5) the second operand
- * @returns out {array} (mat 5x5)
+ * @param out {array} (mat 5x4) the receiving matrix
+ * @param a {array} (mat 5x4) the first operand
+ * @param b {array} (mat 5x4) the second operand
+ * @returns out {array} (mat 5x4)
  */
-ColorMatrixFilter.prototype._multiply = function (out, a, b) {
+ColorMatrixFilter.prototype._multiply = function (out, a, b)
+{
 
-    // first line
-    out[0] = a[0]*b[0] + a[1]*b[5] + a[2]*b[10] + a[3]*b[15] + a[4]*b[20];
-    out[1] = a[0]*b[1] + a[1]*b[6] + a[2]*b[11] + a[3]*b[16] +a[4]*b[21];
-    out[2] = a[0]*b[2] + a[1]*b[7] + a[2]*b[12] + a[3]*b[17] +a[4]*b[22];
-    out[3] = a[0]*b[3] + a[1]*b[8] + a[2]*b[13] + a[3]*b[18] +a[4]*b[23];
-    out[4] = a[0]*b[4] + a[1]*b[9] + a[2]*b[14] + a[3]*b[19]+a[4]*b[24];
+    // Red Channel
+    out[0] = (a[0] * b[0]) + (a[1] * b[5]) + (a[2] * b[10]) + (a[3] * b[15]);
+    out[1] = (a[0] * b[1]) + (a[1] * b[6]) + (a[2] * b[11]) + (a[3] * b[16]);
+    out[2] = (a[0] * b[2]) + (a[1] * b[7]) + (a[2] * b[12]) + (a[3] * b[17]);
+    out[3] = (a[0] * b[3]) + (a[1] * b[8]) + (a[2] * b[13]) + (a[3] * b[18]);
+    out[4] = (a[0] * b[4]) + (a[1] * b[9]) + (a[2] * b[14]) + (a[3] * b[19]);
 
-    // second line
-    out[5] = a[5]*b[0] + a[6]*b[5] + a[7]*b[10]+ a[8]*b[15]+a[9]*b[20];
-    out[6] = a[5]*b[1] + a[6]*b[6] + a[7]*b[11]+ a[8]*b[16]+a[9]*b[21];
-    out[7] = a[5]*b[2] + a[6]*b[7] + a[7]*b[12]+ a[8]*b[17]+a[9]*b[22];
-    out[8] = a[5]*b[3] + a[6]*b[8] + a[7]*b[13]+ a[8]*b[18]+a[9]*b[23];
-    out[9] = a[5]*b[4] + a[6]*b[9] + a[7]*b[14]+ a[8]*b[19]+a[9]*b[24];
+    // Green Channel
+    out[5] = (a[5] * b[0]) + (a[6] * b[5]) + (a[7] * b[10]) + (a[8] * b[15]);
+    out[6] = (a[5] * b[1]) + (a[6] * b[6]) + (a[7] * b[11]) + (a[8] * b[16]);
+    out[7] = (a[5] * b[2]) + (a[6] * b[7]) + (a[7] * b[12]) + (a[8] * b[17]);
+    out[8] = (a[5] * b[3]) + (a[6] * b[8]) + (a[7] * b[13]) + (a[8] * b[18]);
+    out[9] = (a[5] * b[4]) + (a[6] * b[9]) + (a[7] * b[14]) + (a[8] * b[19]);
 
-    // third line
-    out[10] = a[10]*b[0] + a[11]*b[5] + a[12]*b[10]+ a[13]*b[15]+a[14]*b[20];
-    out[11] = a[10]*b[1] + a[11]*b[6] + a[12]*b[11]+ a[13]*b[16]+a[14]*b[21];
-    out[12] = a[10]*b[2] + a[11]*b[7] + a[12]*b[12]+ a[13]*b[17]+a[14]*b[22];
-    out[13] = a[10]*b[3] + a[11]*b[8] + a[12]*b[13]+ a[13]*b[18]+a[14]*b[23];
-    out[14] = a[10]*b[4] + a[11]*b[9] + a[12]*b[14]+ a[13]*b[19]+a[14]*b[24];
+    // Blue Channel
+    out[10] = (a[10] * b[0]) + (a[11] * b[5]) + (a[12] * b[10]) + (a[13] * b[15]);
+    out[11] = (a[10] * b[1]) + (a[11] * b[6]) + (a[12] * b[11]) + (a[13] * b[16]);
+    out[12] = (a[10] * b[2]) + (a[11] * b[7]) + (a[12] * b[12]) + (a[13] * b[17]);
+    out[13] = (a[10] * b[3]) + (a[11] * b[8]) + (a[12] * b[13]) + (a[13] * b[18]);
+    out[14] = (a[10] * b[4]) + (a[11] * b[9]) + (a[12] * b[14]) + (a[13] * b[19]);
 
-    // fourth line
-    out[15] = a[15]*b[0] + a[16]*b[5] + a[17]*b[10]+ a[18]*b[15]+a[19]*b[20];
-    out[16] = a[15]*b[1] + a[16]*b[6] + a[17]*b[11]+ a[18]*b[16]+a[19]*b[21];
-    out[17] = a[15]*b[2] + a[16]*b[7] + a[17]*b[12]+ a[18]*b[17]+a[19]*b[22];
-    out[18] = a[15]*b[3] + a[16]*b[8] + a[17]*b[13]+ a[18]*b[18]+a[19]*b[23];
-    out[19] = a[15]*b[4] + a[16]*b[9] + a[17]*b[14]+ a[18]*b[19]+a[19]*b[24];
-
-    // fifth line
-    out[20] = a[20]*b[0] + a[21]*b[5] + a[22]*b[10]+ a[23]*b[15]+a[24]*b[20];
-    out[21] = a[20]*b[1] + a[21]*b[6] + a[22]*b[11]+ a[23]*b[16]+a[24]*b[21];
-    out[22] = a[20]*b[2] + a[21]*b[7] + a[22]*b[12]+ a[23]*b[17]+a[24]*b[22];
-    out[23] = a[20]*b[3] + a[21]*b[8] + a[22]*b[13]+ a[23]*b[18]+a[24]*b[23];
-    out[24] = a[20]*b[4] + a[21]*b[9] + a[22]*b[14]+ a[23]*b[19]+a[24]*b[24];
+    // Alpha Channel
+    out[15] = (a[15] * b[0]) + (a[16] * b[5]) + (a[17] * b[10]) + (a[18] * b[15]);
+    out[16] = (a[15] * b[1]) + (a[16] * b[6]) + (a[17] * b[11]) + (a[18] * b[16]);
+    out[17] = (a[15] * b[2]) + (a[16] * b[7]) + (a[17] * b[12]) + (a[18] * b[17]);
+    out[18] = (a[15] * b[3]) + (a[16] * b[8]) + (a[17] * b[13]) + (a[18] * b[18]);
+    out[19] = (a[15] * b[4]) + (a[16] * b[9]) + (a[17] * b[14]) + (a[18] * b[19]);
 
     return out;
 };
@@ -113,10 +109,10 @@
 /**
  * Create a Float32 Array and normalize the offset component to 0-1
  *
- * @param matrix {array} (mat 5x5)
- * @return m { array } (mat 5x5) with all values between 0-1
+ * @param matrix {number[]} (mat 5x4)
+ * @return m {number[]} (mat 5x4) with all values between 0-1
  */
-ColorMatrixFilter.prototype._colorMatrix = function( matrix )
+ColorMatrixFilter.prototype._colorMatrix = function (matrix)
 {
     // Create a Float32 Array and normalize the offset component to 0-1
     var m = new Float32Array(matrix);
@@ -135,17 +131,15 @@
  * @param b {number} value of the brigthness (0 is black)
  * @param multiply {boolean} refer to ._loadMatrix() method
  */
-ColorMatrixFilter.prototype.brightness = function(b, multiply)
+ColorMatrixFilter.prototype.brightness = function (b, multiply)
 {
     var matrix = [
         b, 0, 0, 0, 0,
         0, b, 0, 0, 0,
         0, 0, b, 0, 0,
-        0, 0, 0, 1, 0,
-        0, 0, 0, 0, 1
+        0, 0, 0, 1, 0
     ];
 
-
     this._loadMatrix(matrix, multiply);
 };
 
@@ -156,18 +150,19 @@
  * @param scale {number} value of the grey (0 is black)
  * @param multiply {boolean} refer to ._loadMatrix() method
  */
-ColorMatrixFilter.prototype.greyscale = function(scale, multiply)
+ColorMatrixFilter.prototype.greyscale = function (scale, multiply)
 {
     var matrix = [
         scale, scale, scale, 0, 0,
         scale, scale, scale, 0, 0,
         scale, scale, scale, 0, 0,
-        0,0,0,1,0,
-        0,0,0,0,1
+        0, 0, 0, 1, 0
     ];
 
     this._loadMatrix(matrix, multiply);
 };
+//Americanized alias
+ColorMatrixFilter.prototype.grayscale = ColorMatrixFilter.prototype.greyscale;
 
 /**
  * Set the black and white matrice
@@ -175,29 +170,28 @@
  *
  * @param multiply {boolean} refer to ._loadMatrix() method
  */
-ColorMatrixFilter.prototype.blackAndWhite = function(multiply)
+ColorMatrixFilter.prototype.blackAndWhite = function (multiply)
 {
     var matrix = [
         0.3, 0.6, 0.1, 0, 0,
         0.3, 0.6, 0.1, 0, 0,
         0.3, 0.6, 0.1, 0, 0,
-        0, 0, 0, 1, 0,
-        0, 0, 0, 0, 1
+        0, 0, 0, 1, 0
     ];
 
     this._loadMatrix(matrix, multiply);
 };
 
 /**
- * Set the hue propertie of the color
+ * Set the hue property of the color
  *
  * Multiply the current matrix
  * @param rotation {number} in degrees
  * @param multiply {boolean} refer to ._loadMatrix() method
  */
-ColorMatrixFilter.prototype.hue = function(rotation, multiply)
+ColorMatrixFilter.prototype.hue = function (rotation, multiply)
 {
-    rotation = (rotation || 0)/180 * Math.PI;
+    rotation = (rotation || 0) / 180 * Math.PI;
     var cos = Math.cos(rotation),
         sin = Math.sin(rotation);
 
@@ -207,11 +201,10 @@
         lumB = 0.072; // or 0.0820
 
     var matrix = [
-        lumR+cos*(1-lumR)+sin*(-lumR), lumG+cos*(-lumG)+sin*(-lumG), lumB+cos*(-lumB)+sin*(1-lumB), 0, 0,
-        lumR+cos*(-lumR)+sin*(0.143), lumG+cos*(1-lumG)+sin*(0.140), lumB+cos*(-lumB)+sin*(-0.283), 0, 0,
-        lumR+cos*(-lumR)+sin*(-(1-lumR)), lumG+cos*(-lumG)+sin*(lumG), lumB+cos*(1-lumB)+sin*(lumB), 0, 0,
-        0, 0, 0, 1, 0,
-        0, 0, 0, 0, 1
+        lumR + cos * (1 - lumR) + sin * (-lumR), lumG + cos * (-lumG) + sin * (-lumG), lumB + cos * (-lumB) + sin * (1 - lumB), 0, 0,
+        lumR + cos * (-lumR) + sin * (0.143), lumG + cos * (1 - lumG) + sin * (0.140), lumB + cos * (-lumB) + sin * (-0.283), 0, 0,
+        lumR + cos * (-lumR) + sin * (-(1 - lumR)), lumG + cos * (-lumG) + sin * (lumG), lumB + cos * (1 - lumB) + sin * (lumB), 0, 0,
+        0, 0, 0, 1, 0
     ];
 
     this._loadMatrix(matrix, multiply);
@@ -226,17 +219,16 @@
  * @param amount {number} value of the contrast
  * @param multiply {boolean} refer to ._loadMatrix() method
  */
-ColorMatrixFilter.prototype.contrast = function(amount, multiply)
+ColorMatrixFilter.prototype.contrast = function (amount, multiply)
 {
     var v = (amount || 0) + 1;
-    var o = -128 * (v-1);
+    var o = -128 * (v - 1);
 
     var matrix = [
         v, 0, 0, 0, o,
         0, v, 0, 0, o,
         0, 0, v, 0, o,
-        0, 0, 0, 1, 0,
-        0, 0, 0, 0, 1
+        0, 0, 0, 1, 0
     ];
 
     this._loadMatrix(matrix, multiply);
@@ -248,17 +240,16 @@
  * @param amount {number}
  * @param multiply {boolean} refer to ._loadMatrix() method
  */
-ColorMatrixFilter.prototype.saturation = function(amount, multiply)
+ColorMatrixFilter.prototype.saturate = function (amount, multiply)
 {
-    var x = (amount || 0) * 2/3 + 1;
-    var y = ((x-1) *-0.5);
+    var x = (amount || 0) * 2 / 3 + 1;
+    var y = ((x - 1) * -0.5);
 
     var matrix = [
         x, y, y, 0, 0,
         y, x, y, 0, 0,
         y, y, x, 0, 0,
-        0, 0, 0, 1, 0,
-        0, 0, 0, 0, 1
+        0, 0, 0, 1, 0
     ];
 
     this._loadMatrix(matrix, multiply);
@@ -271,9 +262,9 @@
  *
  * @param multiply {boolean} refer to ._loadMatrix() method
  */
-ColorMatrixFilter.prototype.desaturate = function(multiply) // jshint unused:false
+ColorMatrixFilter.prototype.desaturate = function (multiply) // jshint unused:false
 {
-    this.saturation(-1);
+    this.saturate(-1);
 };
 
 /**
@@ -281,14 +272,13 @@
  *
  * @param multiply {boolean} refer to ._loadMatrix() method
  */
-ColorMatrixFilter.prototype.negative = function(multiply)
+ColorMatrixFilter.prototype.negative = function (multiply)
 {
     var matrix = [
         0, 1, 1, 0, 0,
         1, 0, 1, 0, 0,
         1, 1, 0, 0, 0,
-        0, 0, 0, 1, 0,
-        0, 0, 0, 0, 1
+        0, 0, 0, 1, 0
     ];
 
     this._loadMatrix(matrix, multiply);
@@ -299,16 +289,16 @@
  *
  * @param multiply {boolean} refer to ._loadMatrix() method
  */
-ColorMatrixFilter.prototype.sepia = function(multiply)
+ColorMatrixFilter.prototype.sepia = function (multiply)
 {
-  var matrix = [
-      0.393, 0.7689999, 0.18899999, 0, 0,
-      0.349, 0.6859999, 0.16799999, 0, 0,
-      0.272, 0.5339999, 0.13099999, 0, 0,
-      0, 0, 0, 1, 0,
-      0, 0, 0, 0, 1];
+    var matrix = [
+        0.393, 0.7689999, 0.18899999, 0, 0,
+        0.349, 0.6859999, 0.16799999, 0, 0,
+        0.272, 0.5339999, 0.13099999, 0, 0,
+        0, 0, 0, 1, 0
+    ];
 
-  this._loadMatrix(matrix, multiply);
+    this._loadMatrix(matrix, multiply);
 };
 
 /**
@@ -316,16 +306,16 @@
  *
  * @param multiply {boolean} refer to ._loadMatrix() method
  */
-ColorMatrixFilter.prototype.technicolor = function(multiply)
+ColorMatrixFilter.prototype.technicolor = function (multiply)
 {
-  var matrix = [
-      1.9125277891456083,-0.8545344976951645,-0.09155508482755585,0,11.793603434377337,
-      -0.3087833385928097,1.7658908555458428,-0.10601743074722245,0,-70.35205161461398,
-      -0.231103377548616,-0.7501899197440212,1.847597816108189,0,30.950940869491138,
-      0, 0, 0, 1, 0,
-      0, 0, 0, 0, 0];
+    var matrix = [
+        1.9125277891456083, -0.8545344976951645, -0.09155508482755585, 0, 11.793603434377337,
+        -0.3087833385928097, 1.7658908555458428, -0.10601743074722245, 0, -70.35205161461398,
+        -0.231103377548616, -0.7501899197440212, 1.847597816108189, 0, 30.950940869491138,
+        0, 0, 0, 1, 0
+    ];
 
-  this._loadMatrix(matrix, multiply);
+    this._loadMatrix(matrix, multiply);
 };
 
 /**
@@ -333,16 +323,16 @@
  *
  * @param multiply {boolean} refer to ._loadMatrix() method
  */
-ColorMatrixFilter.prototype.polaroid = function(multiply)
+ColorMatrixFilter.prototype.polaroid = function (multiply)
 {
-  var matrix = [
-      1.438,-0.062,-0.062,0,0,
-      -0.122,1.378,-0.122,0,0,
-      -0.016,-0.016,1.483,0,0,
-      0,0,0,1,0,
-      0,0,0,0,1];
+    var matrix = [
+        1.438, -0.062, -0.062, 0, 0,
+        -0.122, 1.378, -0.122, 0, 0,
+        -0.016, -0.016, 1.483, 0, 0,
+        0, 0, 0, 1, 0
+    ];
 
-  this._loadMatrix(matrix, multiply);
+    this._loadMatrix(matrix, multiply);
 };
 
 /**
@@ -350,14 +340,13 @@
  *
  * @param multiply {boolean} refer to ._loadMatrix() method
  */
-ColorMatrixFilter.prototype.toBGR = function(multiply)
+ColorMatrixFilter.prototype.toBGR = function (multiply)
 {
     var matrix = [
-        0,0,1,0,0,
-        0,1,0,0,0,
-        1,0,0,0,0,
-        0,0,0,1,0,
-        0,0,0,0,1
+        0, 0, 1, 0, 0,
+        0, 1, 0, 0, 0,
+        1, 0, 0, 0, 0,
+        0, 0, 0, 1, 0
     ];
 
     this._loadMatrix(matrix, multiply);
@@ -368,14 +357,13 @@
  *
  * @param multiply {boolean} refer to ._loadMatrix() method
  */
-ColorMatrixFilter.prototype.kodachrome = function(multiply)
+ColorMatrixFilter.prototype.kodachrome = function (multiply)
 {
     var matrix = [
-        1.1285582396593525,-0.3967382283601348,-0.03992559172921793,0,63.72958762196502,
-        -0.16404339962244616,1.0835251566291304,-0.05498805115633132,0,24.732407896706203,
-        -0.16786010706155763,-0.5603416277695248,1.6014850761964943,0,35.62982807460946,
-        0,0,0,1,0,
-        0,0,0,0,1
+        1.1285582396593525, -0.3967382283601348, -0.03992559172921793, 0, 63.72958762196502,
+        -0.16404339962244616, 1.0835251566291304, -0.05498805115633132, 0, 24.732407896706203,
+        -0.16786010706155763, -0.5603416277695248, 1.6014850761964943, 0, 35.62982807460946,
+        0, 0, 0, 1, 0
     ];
 
     this._loadMatrix(matrix, multiply);
@@ -386,14 +374,13 @@
  *
  * @param multiply {boolean} refer to ._loadMatrix() method
  */
-ColorMatrixFilter.prototype.browni = function(multiply)
+ColorMatrixFilter.prototype.browni = function (multiply)
 {
     var matrix = [
-        0.5997023498159715,0.34553243048391263,-0.2708298674538042,0,47.43192855600873,
-        -0.037703249837783157,0.8609577587992641,0.15059552388459913,0,-36.96841498319127,
-        0.24113635128153335,-0.07441037908422492,0.44972182064877153,0,-7.562075277591283,
-        0,0,0,1,0,
-        0,0,0,0,1
+        0.5997023498159715, 0.34553243048391263, -0.2708298674538042, 0, 47.43192855600873,
+        -0.037703249837783157, 0.8609577587992641, 0.15059552388459913, 0, -36.96841498319127,
+        0.24113635128153335, -0.07441037908422492, 0.44972182064877153, 0, -7.562075277591283,
+        0, 0, 0, 1, 0
     ];
 
     this._loadMatrix(matrix, multiply);
@@ -404,14 +391,13 @@
  *
  * @param multiply {boolean} refer to ._loadMatrix() method
  */
-ColorMatrixFilter.prototype.vintage = function(multiply)
+ColorMatrixFilter.prototype.vintage = function (multiply)
 {
     var matrix = [
-        0.6279345635605994,0.3202183420819367,-0.03965408211312453,0,9.651285835294123,
-        0.02578397704808868,0.6441188644374771,0.03259127616149294,0,7.462829176470591,
-        0.0466055556782719,-0.0851232987247891,0.5241648018700465,0,5.159190588235296,
-        0,0,0,1,0,
-        0,0,0,0,1,
+        0.6279345635605994, 0.3202183420819367, -0.03965408211312453, 0, 9.651285835294123,
+        0.02578397704808868, 0.6441188644374771, 0.03259127616149294, 0, 7.462829176470591,
+        0.0466055556782719, -0.0851232987247891, 0.5241648018700465, 0, 5.159190588235296,
+        0, 0, 0, 1, 0
     ];
 
     this._loadMatrix(matrix, multiply);
@@ -427,7 +413,7 @@
  *
  * @param multiply {boolean} refer to ._loadMatrix() method
  */
-ColorMatrixFilter.prototype.colorTone = function(desaturation, toned, lightColor, darkColor, multiply)
+ColorMatrixFilter.prototype.colorTone = function (desaturation, toned, lightColor, darkColor, multiply)
 {
     desaturation = desaturation || 0.2;
     toned = toned || 0.15;
@@ -446,8 +432,7 @@
         0.3, 0.59, 0.11, 0, 0,
         lR, lG, lB, desaturation, 0,
         dR, dG, dB, toned, 0,
-        lR-dR, lG-dG, lB-dB, 0, 0,
-        0, 0, 0, 0, 1
+        lR - dR, lG - dG, lB - dB, 0, 0
     ];
 
     this._loadMatrix(matrix, multiply);
@@ -459,15 +444,14 @@
  * @param intensity {number}
  * @param multiply {boolean} refer to ._loadMatrix() method
  */
-ColorMatrixFilter.prototype.night = function(intensity, multiply)
+ColorMatrixFilter.prototype.night = function (intensity, multiply)
 {
     intensity = intensity || 0.1;
     var matrix = [
-        intensity * ( -2.0), -intensity,  0, 0, 0,
-        -intensity, 0,  intensity, 0, 0,
+        intensity * ( -2.0), -intensity, 0, 0, 0,
+        -intensity, 0, intensity, 0, 0,
         0, intensity, intensity * 2.0, 0, 0,
-        0,0,0,1,0,
-        0,0,0,0,1
+        0, 0, 0, 1, 0
     ];
 
     this._loadMatrix(matrix, multiply);
@@ -482,14 +466,13 @@
  * @param amount {number} how much the predator feels his future victim
  * @param multiply {boolean} refer to ._loadMatrix() method
  */
-ColorMatrixFilter.prototype.predator = function(amount, multiply)
+ColorMatrixFilter.prototype.predator = function (amount, multiply)
 {
     var matrix = [
-        11.224130630493164*amount, -4.794486999511719*amount, -2.8746118545532227*amount, 0*amount, 0.40342438220977783*amount,
-        -3.6330697536468506*amount, 9.193157196044922*amount, -2.951810836791992*amount, 0*amount, -1.316135048866272*amount,
-        -3.2184197902679443*amount, -4.2375030517578125*amount, 7.476448059082031*amount, 0*amount, 0.8044459223747253*amount,
-        0, 0, 0, 1, 0,
-        0, 0, 0, 0, 0
+        11.224130630493164 * amount, -4.794486999511719 * amount, -2.8746118545532227 * amount, 0 * amount, 0.40342438220977783 * amount,
+        -3.6330697536468506 * amount, 9.193157196044922 * amount, -2.951810836791992 * amount, 0 * amount, -1.316135048866272 * amount,
+        -3.2184197902679443 * amount, -4.2375030517578125 * amount, 7.476448059082031 * amount, 0 * amount, 0.8044459223747253 * amount,
+        0, 0, 0, 1, 0
     ];
 
     this._loadMatrix(matrix, multiply);
@@ -503,14 +486,13 @@
  * @param amount {number} How crazy is your effect
  * @param multiply {boolean} refer to ._loadMatrix() method
  */
-ColorMatrixFilter.prototype.lsd = function(multiply)
+ColorMatrixFilter.prototype.lsd = function (multiply)
 {
     var matrix = [
         2, -0.4, 0.5, 0, 0,
         -0.5, 2, -0.4, 0, 0,
         -0.4, -0.5, 3, 0, 0,
-        0,0,0,1,0,
-        0,0,0,0,1
+        0, 0, 0, 1, 0
     ];
 
     this._loadMatrix(matrix, multiply);
@@ -522,17 +504,16 @@
  * Erase the current matrix by setting the default one
  *
  */
-ColorMatrixFilter.prototype.reset = function()
+ColorMatrixFilter.prototype.reset = function ()
 {
-  var matrix = [
-    1,0,0,0,0,
-    0,1,0,0,0,
-    0,0,1,0,0,
-    0,0,0,1,0,
-    0,0,0,0,1
-  ];
+    var matrix = [
+        1, 0, 0, 0, 0,
+        0, 1, 0, 0, 0,
+        0, 0, 1, 0, 0,
+        0, 0, 0, 1, 0
+    ];
 
-  this._loadMatrix(matrix, false);
+    this._loadMatrix(matrix, false);
 };
 
 
@@ -542,7 +523,7 @@
      *
      * @member {number[]}
      * @memberof ColorMatrixFilter#
-     * @default [1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1]
+     * @default [1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 0]
      */
     matrix: {
         get: function ()

diff --git a/.jshintrc b/.jshintrc
index e8dff7e..79b981b 100644
--- a/.jshintrc
+++ b/.jshintrc
@@ -33,11 +33,9 @@
     "trailing"      : true,     // Prohibit trailing whitespaces.
     "maxparams"     : 8,        // Prohibit having more than X number of params in a function.
     "maxdepth"      : 8,        // Prohibit nested blocks from going more than X levels deep.
-    "maxstatements" : false,    // Restrict the number of statements in a function.
-    "maxcomplexity" : false,    // Restrict the cyclomatic complexity of the code.
     "maxlen"        : 220,      // Require that all lines are 100 characters or less.
     "globals"       : {         // Register globals that are used in the code.
-        "performance": false    // Depends on polyfill, simplifies usage
+        "performance": false   // Depends on polyfill, simplifies usage
     },
 
     // == Relaxing Options ================================================
diff --git a/src/core/renderers/canvas/CanvasRenderer.js b/src/core/renderers/canvas/CanvasRenderer.js
index 8d6c465..7893cd2 100644
--- a/src/core/renderers/canvas/CanvasRenderer.js
+++ b/src/core/renderers/canvas/CanvasRenderer.js
@@ -239,7 +239,7 @@
             this.blendModes[CONST.BLEND_MODES.DIFFERENCE]    = 'difference';
             this.blendModes[CONST.BLEND_MODES.EXCLUSION]     = 'exclusion';
             this.blendModes[CONST.BLEND_MODES.HUE]           = 'hue';
-            this.blendModes[CONST.BLEND_MODES.SATURATION]    = 'saturation';
+            this.blendModes[CONST.BLEND_MODES.SATURATION]    = 'saturate';
             this.blendModes[CONST.BLEND_MODES.COLOR]         = 'color';
             this.blendModes[CONST.BLEND_MODES.LUMINOSITY]    = 'luminosity';
         }
diff --git a/src/filters/color/ColorMatrixFilter.js b/src/filters/color/ColorMatrixFilter.js
index 4c2aab8..d0e099b 100644
--- a/src/filters/color/ColorMatrixFilter.js
+++ b/src/filters/color/ColorMatrixFilter.js
@@ -3,7 +3,7 @@
 var fs = require('fs');
 
 /**
- * The ColorMatrixFilter class lets you apply a 5x5 matrix transformation on the RGBA
+ * The ColorMatrixFilter class lets you apply a 5x4 matrix transformation on the RGBA
  * color and alpha values of every pixel on your displayObject to produce a result
  * with a new set of RGBA color and alpha values. It's pretty powerful!
  *
@@ -26,11 +26,14 @@
         fs.readFileSync(__dirname + '/colorMatrix.frag', 'utf8'),
         // custom uniforms
         {
-            m: { type: '1fv', value: [1, 0, 0, 0, 0,
-                                    0, 1, 0, 0, 0,
-                                    0, 0, 1, 0, 0,
-                                    0, 0, 0, 1, 0,
-                                    0, 0, 0, 0, 1] }
+            m: {
+                type: '1fv', value: [
+                    1, 0, 0, 0, 0,
+                    0, 1, 0, 0, 0,
+                    0, 0, 1, 0, 0,
+                    0, 0, 0, 1, 0
+                ]
+            }
         }
     );
 }
@@ -43,17 +46,16 @@
 /**
  * Transforms current matrix and set the new one
  *
- * @param matrix {array} (mat 5x5)
+ * @param matrix {number[]} (mat 5x4)
  * @param multiply {boolean} if true, current matrix and matrix are multiplied. If false, just set the current matrix with @param matrix
  */
-ColorMatrixFilter.prototype._loadMatrix = function(matrix, multiply)
+ColorMatrixFilter.prototype._loadMatrix = function (matrix, multiply)
 {
     multiply = !!multiply;
 
     var newMatrix = matrix;
 
-    if(multiply)
-    {
+    if (multiply) {
         this._multiply(newMatrix, this.uniforms.m.value, matrix);
         newMatrix = this._colorMatrix(newMatrix);
     }
@@ -65,47 +67,41 @@
 /**
  * Multiplies two mat5's
  *
- * @param out {array} (mat 5x5) the receiving matrix
- * @param a {array} (mat 5x5) the first operand
- * @param b {array} (mat 5x5) the second operand
- * @returns out {array} (mat 5x5)
+ * @param out {array} (mat 5x4) the receiving matrix
+ * @param a {array} (mat 5x4) the first operand
+ * @param b {array} (mat 5x4) the second operand
+ * @returns out {array} (mat 5x4)
  */
-ColorMatrixFilter.prototype._multiply = function (out, a, b) {
+ColorMatrixFilter.prototype._multiply = function (out, a, b)
+{
 
-    // first line
-    out[0] = a[0]*b[0] + a[1]*b[5] + a[2]*b[10] + a[3]*b[15] + a[4]*b[20];
-    out[1] = a[0]*b[1] + a[1]*b[6] + a[2]*b[11] + a[3]*b[16] +a[4]*b[21];
-    out[2] = a[0]*b[2] + a[1]*b[7] + a[2]*b[12] + a[3]*b[17] +a[4]*b[22];
-    out[3] = a[0]*b[3] + a[1]*b[8] + a[2]*b[13] + a[3]*b[18] +a[4]*b[23];
-    out[4] = a[0]*b[4] + a[1]*b[9] + a[2]*b[14] + a[3]*b[19]+a[4]*b[24];
+    // Red Channel
+    out[0] = (a[0] * b[0]) + (a[1] * b[5]) + (a[2] * b[10]) + (a[3] * b[15]);
+    out[1] = (a[0] * b[1]) + (a[1] * b[6]) + (a[2] * b[11]) + (a[3] * b[16]);
+    out[2] = (a[0] * b[2]) + (a[1] * b[7]) + (a[2] * b[12]) + (a[3] * b[17]);
+    out[3] = (a[0] * b[3]) + (a[1] * b[8]) + (a[2] * b[13]) + (a[3] * b[18]);
+    out[4] = (a[0] * b[4]) + (a[1] * b[9]) + (a[2] * b[14]) + (a[3] * b[19]);
 
-    // second line
-    out[5] = a[5]*b[0] + a[6]*b[5] + a[7]*b[10]+ a[8]*b[15]+a[9]*b[20];
-    out[6] = a[5]*b[1] + a[6]*b[6] + a[7]*b[11]+ a[8]*b[16]+a[9]*b[21];
-    out[7] = a[5]*b[2] + a[6]*b[7] + a[7]*b[12]+ a[8]*b[17]+a[9]*b[22];
-    out[8] = a[5]*b[3] + a[6]*b[8] + a[7]*b[13]+ a[8]*b[18]+a[9]*b[23];
-    out[9] = a[5]*b[4] + a[6]*b[9] + a[7]*b[14]+ a[8]*b[19]+a[9]*b[24];
+    // Green Channel
+    out[5] = (a[5] * b[0]) + (a[6] * b[5]) + (a[7] * b[10]) + (a[8] * b[15]);
+    out[6] = (a[5] * b[1]) + (a[6] * b[6]) + (a[7] * b[11]) + (a[8] * b[16]);
+    out[7] = (a[5] * b[2]) + (a[6] * b[7]) + (a[7] * b[12]) + (a[8] * b[17]);
+    out[8] = (a[5] * b[3]) + (a[6] * b[8]) + (a[7] * b[13]) + (a[8] * b[18]);
+    out[9] = (a[5] * b[4]) + (a[6] * b[9]) + (a[7] * b[14]) + (a[8] * b[19]);
 
-    // third line
-    out[10] = a[10]*b[0] + a[11]*b[5] + a[12]*b[10]+ a[13]*b[15]+a[14]*b[20];
-    out[11] = a[10]*b[1] + a[11]*b[6] + a[12]*b[11]+ a[13]*b[16]+a[14]*b[21];
-    out[12] = a[10]*b[2] + a[11]*b[7] + a[12]*b[12]+ a[13]*b[17]+a[14]*b[22];
-    out[13] = a[10]*b[3] + a[11]*b[8] + a[12]*b[13]+ a[13]*b[18]+a[14]*b[23];
-    out[14] = a[10]*b[4] + a[11]*b[9] + a[12]*b[14]+ a[13]*b[19]+a[14]*b[24];
+    // Blue Channel
+    out[10] = (a[10] * b[0]) + (a[11] * b[5]) + (a[12] * b[10]) + (a[13] * b[15]);
+    out[11] = (a[10] * b[1]) + (a[11] * b[6]) + (a[12] * b[11]) + (a[13] * b[16]);
+    out[12] = (a[10] * b[2]) + (a[11] * b[7]) + (a[12] * b[12]) + (a[13] * b[17]);
+    out[13] = (a[10] * b[3]) + (a[11] * b[8]) + (a[12] * b[13]) + (a[13] * b[18]);
+    out[14] = (a[10] * b[4]) + (a[11] * b[9]) + (a[12] * b[14]) + (a[13] * b[19]);
 
-    // fourth line
-    out[15] = a[15]*b[0] + a[16]*b[5] + a[17]*b[10]+ a[18]*b[15]+a[19]*b[20];
-    out[16] = a[15]*b[1] + a[16]*b[6] + a[17]*b[11]+ a[18]*b[16]+a[19]*b[21];
-    out[17] = a[15]*b[2] + a[16]*b[7] + a[17]*b[12]+ a[18]*b[17]+a[19]*b[22];
-    out[18] = a[15]*b[3] + a[16]*b[8] + a[17]*b[13]+ a[18]*b[18]+a[19]*b[23];
-    out[19] = a[15]*b[4] + a[16]*b[9] + a[17]*b[14]+ a[18]*b[19]+a[19]*b[24];
-
-    // fifth line
-    out[20] = a[20]*b[0] + a[21]*b[5] + a[22]*b[10]+ a[23]*b[15]+a[24]*b[20];
-    out[21] = a[20]*b[1] + a[21]*b[6] + a[22]*b[11]+ a[23]*b[16]+a[24]*b[21];
-    out[22] = a[20]*b[2] + a[21]*b[7] + a[22]*b[12]+ a[23]*b[17]+a[24]*b[22];
-    out[23] = a[20]*b[3] + a[21]*b[8] + a[22]*b[13]+ a[23]*b[18]+a[24]*b[23];
-    out[24] = a[20]*b[4] + a[21]*b[9] + a[22]*b[14]+ a[23]*b[19]+a[24]*b[24];
+    // Alpha Channel
+    out[15] = (a[15] * b[0]) + (a[16] * b[5]) + (a[17] * b[10]) + (a[18] * b[15]);
+    out[16] = (a[15] * b[1]) + (a[16] * b[6]) + (a[17] * b[11]) + (a[18] * b[16]);
+    out[17] = (a[15] * b[2]) + (a[16] * b[7]) + (a[17] * b[12]) + (a[18] * b[17]);
+    out[18] = (a[15] * b[3]) + (a[16] * b[8]) + (a[17] * b[13]) + (a[18] * b[18]);
+    out[19] = (a[15] * b[4]) + (a[16] * b[9]) + (a[17] * b[14]) + (a[18] * b[19]);
 
     return out;
 };
@@ -113,10 +109,10 @@
 /**
  * Create a Float32 Array and normalize the offset component to 0-1
  *
- * @param matrix {array} (mat 5x5)
- * @return m { array } (mat 5x5) with all values between 0-1
+ * @param matrix {number[]} (mat 5x4)
+ * @return m {number[]} (mat 5x4) with all values between 0-1
  */
-ColorMatrixFilter.prototype._colorMatrix = function( matrix )
+ColorMatrixFilter.prototype._colorMatrix = function (matrix)
 {
     // Create a Float32 Array and normalize the offset component to 0-1
     var m = new Float32Array(matrix);
@@ -135,17 +131,15 @@
  * @param b {number} value of the brigthness (0 is black)
  * @param multiply {boolean} refer to ._loadMatrix() method
  */
-ColorMatrixFilter.prototype.brightness = function(b, multiply)
+ColorMatrixFilter.prototype.brightness = function (b, multiply)
 {
     var matrix = [
         b, 0, 0, 0, 0,
         0, b, 0, 0, 0,
         0, 0, b, 0, 0,
-        0, 0, 0, 1, 0,
-        0, 0, 0, 0, 1
+        0, 0, 0, 1, 0
     ];
 
-
     this._loadMatrix(matrix, multiply);
 };
 
@@ -156,18 +150,19 @@
  * @param scale {number} value of the grey (0 is black)
  * @param multiply {boolean} refer to ._loadMatrix() method
  */
-ColorMatrixFilter.prototype.greyscale = function(scale, multiply)
+ColorMatrixFilter.prototype.greyscale = function (scale, multiply)
 {
     var matrix = [
         scale, scale, scale, 0, 0,
         scale, scale, scale, 0, 0,
         scale, scale, scale, 0, 0,
-        0,0,0,1,0,
-        0,0,0,0,1
+        0, 0, 0, 1, 0
     ];
 
     this._loadMatrix(matrix, multiply);
 };
+//Americanized alias
+ColorMatrixFilter.prototype.grayscale = ColorMatrixFilter.prototype.greyscale;
 
 /**
  * Set the black and white matrice
@@ -175,29 +170,28 @@
  *
  * @param multiply {boolean} refer to ._loadMatrix() method
  */
-ColorMatrixFilter.prototype.blackAndWhite = function(multiply)
+ColorMatrixFilter.prototype.blackAndWhite = function (multiply)
 {
     var matrix = [
         0.3, 0.6, 0.1, 0, 0,
         0.3, 0.6, 0.1, 0, 0,
         0.3, 0.6, 0.1, 0, 0,
-        0, 0, 0, 1, 0,
-        0, 0, 0, 0, 1
+        0, 0, 0, 1, 0
     ];
 
     this._loadMatrix(matrix, multiply);
 };
 
 /**
- * Set the hue propertie of the color
+ * Set the hue property of the color
  *
  * Multiply the current matrix
  * @param rotation {number} in degrees
  * @param multiply {boolean} refer to ._loadMatrix() method
  */
-ColorMatrixFilter.prototype.hue = function(rotation, multiply)
+ColorMatrixFilter.prototype.hue = function (rotation, multiply)
 {
-    rotation = (rotation || 0)/180 * Math.PI;
+    rotation = (rotation || 0) / 180 * Math.PI;
     var cos = Math.cos(rotation),
         sin = Math.sin(rotation);
 
@@ -207,11 +201,10 @@
         lumB = 0.072; // or 0.0820
 
     var matrix = [
-        lumR+cos*(1-lumR)+sin*(-lumR), lumG+cos*(-lumG)+sin*(-lumG), lumB+cos*(-lumB)+sin*(1-lumB), 0, 0,
-        lumR+cos*(-lumR)+sin*(0.143), lumG+cos*(1-lumG)+sin*(0.140), lumB+cos*(-lumB)+sin*(-0.283), 0, 0,
-        lumR+cos*(-lumR)+sin*(-(1-lumR)), lumG+cos*(-lumG)+sin*(lumG), lumB+cos*(1-lumB)+sin*(lumB), 0, 0,
-        0, 0, 0, 1, 0,
-        0, 0, 0, 0, 1
+        lumR + cos * (1 - lumR) + sin * (-lumR), lumG + cos * (-lumG) + sin * (-lumG), lumB + cos * (-lumB) + sin * (1 - lumB), 0, 0,
+        lumR + cos * (-lumR) + sin * (0.143), lumG + cos * (1 - lumG) + sin * (0.140), lumB + cos * (-lumB) + sin * (-0.283), 0, 0,
+        lumR + cos * (-lumR) + sin * (-(1 - lumR)), lumG + cos * (-lumG) + sin * (lumG), lumB + cos * (1 - lumB) + sin * (lumB), 0, 0,
+        0, 0, 0, 1, 0
     ];
 
     this._loadMatrix(matrix, multiply);
@@ -226,17 +219,16 @@
  * @param amount {number} value of the contrast
  * @param multiply {boolean} refer to ._loadMatrix() method
  */
-ColorMatrixFilter.prototype.contrast = function(amount, multiply)
+ColorMatrixFilter.prototype.contrast = function (amount, multiply)
 {
     var v = (amount || 0) + 1;
-    var o = -128 * (v-1);
+    var o = -128 * (v - 1);
 
     var matrix = [
         v, 0, 0, 0, o,
         0, v, 0, 0, o,
         0, 0, v, 0, o,
-        0, 0, 0, 1, 0,
-        0, 0, 0, 0, 1
+        0, 0, 0, 1, 0
     ];
 
     this._loadMatrix(matrix, multiply);
@@ -248,17 +240,16 @@
  * @param amount {number}
  * @param multiply {boolean} refer to ._loadMatrix() method
  */
-ColorMatrixFilter.prototype.saturation = function(amount, multiply)
+ColorMatrixFilter.prototype.saturate = function (amount, multiply)
 {
-    var x = (amount || 0) * 2/3 + 1;
-    var y = ((x-1) *-0.5);
+    var x = (amount || 0) * 2 / 3 + 1;
+    var y = ((x - 1) * -0.5);
 
     var matrix = [
         x, y, y, 0, 0,
         y, x, y, 0, 0,
         y, y, x, 0, 0,
-        0, 0, 0, 1, 0,
-        0, 0, 0, 0, 1
+        0, 0, 0, 1, 0
     ];
 
     this._loadMatrix(matrix, multiply);
@@ -271,9 +262,9 @@
  *
  * @param multiply {boolean} refer to ._loadMatrix() method
  */
-ColorMatrixFilter.prototype.desaturate = function(multiply) // jshint unused:false
+ColorMatrixFilter.prototype.desaturate = function (multiply) // jshint unused:false
 {
-    this.saturation(-1);
+    this.saturate(-1);
 };
 
 /**
@@ -281,14 +272,13 @@
  *
  * @param multiply {boolean} refer to ._loadMatrix() method
  */
-ColorMatrixFilter.prototype.negative = function(multiply)
+ColorMatrixFilter.prototype.negative = function (multiply)
 {
     var matrix = [
         0, 1, 1, 0, 0,
         1, 0, 1, 0, 0,
         1, 1, 0, 0, 0,
-        0, 0, 0, 1, 0,
-        0, 0, 0, 0, 1
+        0, 0, 0, 1, 0
     ];
 
     this._loadMatrix(matrix, multiply);
@@ -299,16 +289,16 @@
  *
  * @param multiply {boolean} refer to ._loadMatrix() method
  */
-ColorMatrixFilter.prototype.sepia = function(multiply)
+ColorMatrixFilter.prototype.sepia = function (multiply)
 {
-  var matrix = [
-      0.393, 0.7689999, 0.18899999, 0, 0,
-      0.349, 0.6859999, 0.16799999, 0, 0,
-      0.272, 0.5339999, 0.13099999, 0, 0,
-      0, 0, 0, 1, 0,
-      0, 0, 0, 0, 1];
+    var matrix = [
+        0.393, 0.7689999, 0.18899999, 0, 0,
+        0.349, 0.6859999, 0.16799999, 0, 0,
+        0.272, 0.5339999, 0.13099999, 0, 0,
+        0, 0, 0, 1, 0
+    ];
 
-  this._loadMatrix(matrix, multiply);
+    this._loadMatrix(matrix, multiply);
 };
 
 /**
@@ -316,16 +306,16 @@
  *
  * @param multiply {boolean} refer to ._loadMatrix() method
  */
-ColorMatrixFilter.prototype.technicolor = function(multiply)
+ColorMatrixFilter.prototype.technicolor = function (multiply)
 {
-  var matrix = [
-      1.9125277891456083,-0.8545344976951645,-0.09155508482755585,0,11.793603434377337,
-      -0.3087833385928097,1.7658908555458428,-0.10601743074722245,0,-70.35205161461398,
-      -0.231103377548616,-0.7501899197440212,1.847597816108189,0,30.950940869491138,
-      0, 0, 0, 1, 0,
-      0, 0, 0, 0, 0];
+    var matrix = [
+        1.9125277891456083, -0.8545344976951645, -0.09155508482755585, 0, 11.793603434377337,
+        -0.3087833385928097, 1.7658908555458428, -0.10601743074722245, 0, -70.35205161461398,
+        -0.231103377548616, -0.7501899197440212, 1.847597816108189, 0, 30.950940869491138,
+        0, 0, 0, 1, 0
+    ];
 
-  this._loadMatrix(matrix, multiply);
+    this._loadMatrix(matrix, multiply);
 };
 
 /**
@@ -333,16 +323,16 @@
  *
  * @param multiply {boolean} refer to ._loadMatrix() method
  */
-ColorMatrixFilter.prototype.polaroid = function(multiply)
+ColorMatrixFilter.prototype.polaroid = function (multiply)
 {
-  var matrix = [
-      1.438,-0.062,-0.062,0,0,
-      -0.122,1.378,-0.122,0,0,
-      -0.016,-0.016,1.483,0,0,
-      0,0,0,1,0,
-      0,0,0,0,1];
+    var matrix = [
+        1.438, -0.062, -0.062, 0, 0,
+        -0.122, 1.378, -0.122, 0, 0,
+        -0.016, -0.016, 1.483, 0, 0,
+        0, 0, 0, 1, 0
+    ];
 
-  this._loadMatrix(matrix, multiply);
+    this._loadMatrix(matrix, multiply);
 };
 
 /**
@@ -350,14 +340,13 @@
  *
  * @param multiply {boolean} refer to ._loadMatrix() method
  */
-ColorMatrixFilter.prototype.toBGR = function(multiply)
+ColorMatrixFilter.prototype.toBGR = function (multiply)
 {
     var matrix = [
-        0,0,1,0,0,
-        0,1,0,0,0,
-        1,0,0,0,0,
-        0,0,0,1,0,
-        0,0,0,0,1
+        0, 0, 1, 0, 0,
+        0, 1, 0, 0, 0,
+        1, 0, 0, 0, 0,
+        0, 0, 0, 1, 0
     ];
 
     this._loadMatrix(matrix, multiply);
@@ -368,14 +357,13 @@
  *
  * @param multiply {boolean} refer to ._loadMatrix() method
  */
-ColorMatrixFilter.prototype.kodachrome = function(multiply)
+ColorMatrixFilter.prototype.kodachrome = function (multiply)
 {
     var matrix = [
-        1.1285582396593525,-0.3967382283601348,-0.03992559172921793,0,63.72958762196502,
-        -0.16404339962244616,1.0835251566291304,-0.05498805115633132,0,24.732407896706203,
-        -0.16786010706155763,-0.5603416277695248,1.6014850761964943,0,35.62982807460946,
-        0,0,0,1,0,
-        0,0,0,0,1
+        1.1285582396593525, -0.3967382283601348, -0.03992559172921793, 0, 63.72958762196502,
+        -0.16404339962244616, 1.0835251566291304, -0.05498805115633132, 0, 24.732407896706203,
+        -0.16786010706155763, -0.5603416277695248, 1.6014850761964943, 0, 35.62982807460946,
+        0, 0, 0, 1, 0
     ];
 
     this._loadMatrix(matrix, multiply);
@@ -386,14 +374,13 @@
  *
  * @param multiply {boolean} refer to ._loadMatrix() method
  */
-ColorMatrixFilter.prototype.browni = function(multiply)
+ColorMatrixFilter.prototype.browni = function (multiply)
 {
     var matrix = [
-        0.5997023498159715,0.34553243048391263,-0.2708298674538042,0,47.43192855600873,
-        -0.037703249837783157,0.8609577587992641,0.15059552388459913,0,-36.96841498319127,
-        0.24113635128153335,-0.07441037908422492,0.44972182064877153,0,-7.562075277591283,
-        0,0,0,1,0,
-        0,0,0,0,1
+        0.5997023498159715, 0.34553243048391263, -0.2708298674538042, 0, 47.43192855600873,
+        -0.037703249837783157, 0.8609577587992641, 0.15059552388459913, 0, -36.96841498319127,
+        0.24113635128153335, -0.07441037908422492, 0.44972182064877153, 0, -7.562075277591283,
+        0, 0, 0, 1, 0
     ];
 
     this._loadMatrix(matrix, multiply);
@@ -404,14 +391,13 @@
  *
  * @param multiply {boolean} refer to ._loadMatrix() method
  */
-ColorMatrixFilter.prototype.vintage = function(multiply)
+ColorMatrixFilter.prototype.vintage = function (multiply)
 {
     var matrix = [
-        0.6279345635605994,0.3202183420819367,-0.03965408211312453,0,9.651285835294123,
-        0.02578397704808868,0.6441188644374771,0.03259127616149294,0,7.462829176470591,
-        0.0466055556782719,-0.0851232987247891,0.5241648018700465,0,5.159190588235296,
-        0,0,0,1,0,
-        0,0,0,0,1,
+        0.6279345635605994, 0.3202183420819367, -0.03965408211312453, 0, 9.651285835294123,
+        0.02578397704808868, 0.6441188644374771, 0.03259127616149294, 0, 7.462829176470591,
+        0.0466055556782719, -0.0851232987247891, 0.5241648018700465, 0, 5.159190588235296,
+        0, 0, 0, 1, 0
     ];
 
     this._loadMatrix(matrix, multiply);
@@ -427,7 +413,7 @@
  *
  * @param multiply {boolean} refer to ._loadMatrix() method
  */
-ColorMatrixFilter.prototype.colorTone = function(desaturation, toned, lightColor, darkColor, multiply)
+ColorMatrixFilter.prototype.colorTone = function (desaturation, toned, lightColor, darkColor, multiply)
 {
     desaturation = desaturation || 0.2;
     toned = toned || 0.15;
@@ -446,8 +432,7 @@
         0.3, 0.59, 0.11, 0, 0,
         lR, lG, lB, desaturation, 0,
         dR, dG, dB, toned, 0,
-        lR-dR, lG-dG, lB-dB, 0, 0,
-        0, 0, 0, 0, 1
+        lR - dR, lG - dG, lB - dB, 0, 0
     ];
 
     this._loadMatrix(matrix, multiply);
@@ -459,15 +444,14 @@
  * @param intensity {number}
  * @param multiply {boolean} refer to ._loadMatrix() method
  */
-ColorMatrixFilter.prototype.night = function(intensity, multiply)
+ColorMatrixFilter.prototype.night = function (intensity, multiply)
 {
     intensity = intensity || 0.1;
     var matrix = [
-        intensity * ( -2.0), -intensity,  0, 0, 0,
-        -intensity, 0,  intensity, 0, 0,
+        intensity * ( -2.0), -intensity, 0, 0, 0,
+        -intensity, 0, intensity, 0, 0,
         0, intensity, intensity * 2.0, 0, 0,
-        0,0,0,1,0,
-        0,0,0,0,1
+        0, 0, 0, 1, 0
     ];
 
     this._loadMatrix(matrix, multiply);
@@ -482,14 +466,13 @@
  * @param amount {number} how much the predator feels his future victim
  * @param multiply {boolean} refer to ._loadMatrix() method
  */
-ColorMatrixFilter.prototype.predator = function(amount, multiply)
+ColorMatrixFilter.prototype.predator = function (amount, multiply)
 {
     var matrix = [
-        11.224130630493164*amount, -4.794486999511719*amount, -2.8746118545532227*amount, 0*amount, 0.40342438220977783*amount,
-        -3.6330697536468506*amount, 9.193157196044922*amount, -2.951810836791992*amount, 0*amount, -1.316135048866272*amount,
-        -3.2184197902679443*amount, -4.2375030517578125*amount, 7.476448059082031*amount, 0*amount, 0.8044459223747253*amount,
-        0, 0, 0, 1, 0,
-        0, 0, 0, 0, 0
+        11.224130630493164 * amount, -4.794486999511719 * amount, -2.8746118545532227 * amount, 0 * amount, 0.40342438220977783 * amount,
+        -3.6330697536468506 * amount, 9.193157196044922 * amount, -2.951810836791992 * amount, 0 * amount, -1.316135048866272 * amount,
+        -3.2184197902679443 * amount, -4.2375030517578125 * amount, 7.476448059082031 * amount, 0 * amount, 0.8044459223747253 * amount,
+        0, 0, 0, 1, 0
     ];
 
     this._loadMatrix(matrix, multiply);
@@ -503,14 +486,13 @@
  * @param amount {number} How crazy is your effect
  * @param multiply {boolean} refer to ._loadMatrix() method
  */
-ColorMatrixFilter.prototype.lsd = function(multiply)
+ColorMatrixFilter.prototype.lsd = function (multiply)
 {
     var matrix = [
         2, -0.4, 0.5, 0, 0,
         -0.5, 2, -0.4, 0, 0,
         -0.4, -0.5, 3, 0, 0,
-        0,0,0,1,0,
-        0,0,0,0,1
+        0, 0, 0, 1, 0
     ];
 
     this._loadMatrix(matrix, multiply);
@@ -522,17 +504,16 @@
  * Erase the current matrix by setting the default one
  *
  */
-ColorMatrixFilter.prototype.reset = function()
+ColorMatrixFilter.prototype.reset = function ()
 {
-  var matrix = [
-    1,0,0,0,0,
-    0,1,0,0,0,
-    0,0,1,0,0,
-    0,0,0,1,0,
-    0,0,0,0,1
-  ];
+    var matrix = [
+        1, 0, 0, 0, 0,
+        0, 1, 0, 0, 0,
+        0, 0, 1, 0, 0,
+        0, 0, 0, 1, 0
+    ];
 
-  this._loadMatrix(matrix, false);
+    this._loadMatrix(matrix, false);
 };
 
 
@@ -542,7 +523,7 @@
      *
      * @member {number[]}
      * @memberof ColorMatrixFilter#
-     * @default [1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1]
+     * @default [1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 0]
      */
     matrix: {
         get: function ()
diff --git a/src/filters/color/colorMatrix.frag b/src/filters/color/colorMatrix.frag
index 2cd5cca..5de20fc 100644
--- a/src/filters/color/colorMatrix.frag
+++ b/src/filters/color/colorMatrix.frag
@@ -1,19 +1,36 @@
 precision mediump float;
 
 varying vec2 vTextureCoord;
-
 uniform sampler2D uSampler;
-uniform float m[24];
-
-uniform vec4 d;
+uniform float m[25];
 
 void main(void)
 {
-    
+
     vec4 c = texture2D(uSampler, vTextureCoord);
 
-	gl_FragColor.r = m[0] * c.r + m[1] * c.g + m[2] * c.b + m[3] * c.a + m[4];
-	gl_FragColor.g = m[5] * c.r + m[6] * c.g + m[7] * c.b + m[8] * c.a + m[9];
-	gl_FragColor.b = m[10] * c.r + m[11] * c.g + m[12] * c.b + m[13] * c.a + m[14];
-	gl_FragColor.a = c.a;
+    gl_FragColor.r = (m[0] * c.r);
+        gl_FragColor.r += (m[1] * c.g);
+        gl_FragColor.r += (m[2] * c.b);
+        gl_FragColor.r += (m[3] * c.a);
+        gl_FragColor.r += m[4];
+
+    gl_FragColor.g = (m[5] * c.r);
+        gl_FragColor.g += (m[6] * c.g);
+        gl_FragColor.g += (m[7] * c.b);
+        gl_FragColor.g += (m[8] * c.a);
+        gl_FragColor.g += m[9];
+
+     gl_FragColor.b = (m[10] * c.r);
+        gl_FragColor.b += (m[11] * c.g);
+        gl_FragColor.b += (m[12] * c.b);
+        gl_FragColor.b += (m[13] * c.a);
+        gl_FragColor.b += m[14];
+
+     gl_FragColor.a = (m[15] * c.r);
+        gl_FragColor.a += (m[16] * c.g);
+        gl_FragColor.a += (m[17] * c.b);
+        gl_FragColor.a += (m[18] * c.a);
+        gl_FragColor.a += m[19];
+
 }