diff --git a/.eslintrc.js b/.eslintrc.js
index 96ffaf2..9ccd6d3 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -1,232 +1,31 @@
 module.exports = {
-    "env": {
-        "node": true,
-        "browser": true,
-        "commonjs": true
-    },
-    "extends": "eslint:recommended",
-    "rules": {
-        "object-shorthand": "off",
-        "accessor-pairs": "error",
-        "array-bracket-spacing": "error",
-        "array-callback-return": "off",
-        "arrow-body-style": "error",
-        "arrow-parens": "error",
-        "arrow-spacing": "error",
-        "block-scoped-var": "error",
-        "block-spacing": "error",
-        "brace-style": [
-            "error",
-            "1tbs"
-        ],
-        "callback-return": "off",
-        "camelcase": "error",
-        "comma-dangle": "error",
-        "comma-spacing": "off",
-        "comma-style": "error",
-        "complexity": "error",
-        "computed-property-spacing": [
-            "error",
-            "never"
-        ],
-        "consistent-return": "off",
-        "consistent-this": "error",
-        "curly": "off",
-        "default-case": "error",
-        "dot-location": "error",
-        "dot-notation": [
-            "error",
-            {
-                "allowKeywords": true
-            }
-        ],
-        "eol-last": "error",
-        "eqeqeq": [
-            "error",
-            "smart"
-        ],
-        "func-names": [
-            "error",
-            "never"
-        ],
-        "func-style": "off",
-        "generator-star-spacing": "error",
-        "global-require": "error",
-        "guard-for-in": "error",
-        "handle-callback-err": "error",
-        "id-blacklist": "error",
-        "id-length": "off",
-        "id-match": "error",
-        "indent": [
-            "error",
-            2
-        ],
-        "init-declarations": "error",
-        "jsx-quotes": "error",
-        "key-spacing": "error",
-        "keyword-spacing": "off",
-        "linebreak-style": [
-            "error",
-            "unix"
-        ],
-        "lines-around-comment": "error",
-        "max-depth": "error",
-        "max-len": "off",
-        "max-lines": "off",
-        "max-nested-callbacks": "error",
-        "max-params": "off",
-        "max-statements": "off",
-        "max-statements-per-line": "error",
-        "multiline-ternary": "off",
-        "new-cap": "error",
-        "new-parens": "error",
-        "newline-after-var": "off",
-        "newline-before-return": "off",
-        "newline-per-chained-call": "off",
-        "no-alert": "error",
-        "no-array-constructor": "error",
-        "no-bitwise": "off",
-        "no-caller": "error",
-        "no-catch-shadow": "error",
-        "no-confusing-arrow": "error",
-        "no-continue": "error",
-        "no-div-regex": "error",
-        "no-duplicate-imports": "error",
-        "no-else-return": "off",
-        "no-empty-function": "error",
-        "no-eq-null": "error",
-        "no-eval": "error",
-        "no-extend-native": "error",
-        "no-extra-bind": "error",
-        "no-extra-label": "error",
-        "no-extra-parens": "off",
-        "no-floating-decimal": "error",
-        "no-implicit-globals": "off",
-        "no-implied-eval": "error",
-        "no-inline-comments": "error",
-        "no-inner-declarations": [
-            "error",
-            "functions"
-        ],
-        "no-invalid-this": "error",
-        "no-iterator": "error",
-        "no-label-var": "error",
-        "no-labels": "error",
-        "no-lone-blocks": "error",
-        "no-lonely-if": "off",
-        "no-loop-func": "error",
-        "no-magic-numbers": "off",
-        "no-mixed-operators": "error",
-        "no-mixed-requires": "error",
-        "no-multi-spaces": "off",
-        "no-multi-str": "error",
-        "no-multiple-empty-lines": "error",
-        "no-negated-condition": "off",
-        "no-nested-ternary": "error",
-        "no-new": "error",
-        "no-new-func": "error",
-        "no-new-object": "error",
-        "no-new-require": "error",
-        "no-new-wrappers": "error",
-        "no-octal-escape": "error",
-        "no-param-reassign": "off",
-        "no-path-concat": "error",
-        "no-plusplus": "off",
-        "no-process-env": "error",
-        "no-process-exit": "error",
-        "no-proto": "error",
-        "no-prototype-builtins": "off",
-        "no-restricted-globals": "error",
-        "no-restricted-imports": "error",
-        "no-restricted-modules": "error",
-        "no-restricted-syntax": "error",
-        "no-return-assign": "error",
-        "no-script-url": "error",
-        "no-self-compare": "error",
-        "no-sequences": "error",
-        "no-shadow": "off",
-        "no-shadow-restricted-names": "error",
-        "no-spaced-func": "error",
-        "no-sync": "off",
-        "no-ternary": "error",
-        "no-throw-literal": "error",
-        "no-trailing-spaces": "error",
-        "no-undef-init": "error",
-        "no-undefined": "off",
-        "no-underscore-dangle": "error",
-        "no-unmodified-loop-condition": "error",
-        "no-unneeded-ternary": "error",
-        "no-unused-expressions": "error",
-        "no-use-before-define": "off",
-        "no-useless-call": "error",
-        "no-useless-computed-key": "error",
-        "no-useless-concat": "error",
-        "no-useless-constructor": "error",
-        "no-useless-escape": "error",
-        "no-useless-rename": "error",
-        "no-var": "off",
-        "no-void": "error",
-        "no-warning-comments": "error",
-        "no-whitespace-before-property": "error",
-        "no-with": "error",
-        "object-curly-newline": "error",
-        "object-curly-spacing": "error",
-        "object-property-newline": "error",
-        "one-var": "off",
-        "one-var-declaration-per-line": "error",
-        "operator-assignment": "off",
-        "operator-linebreak": "error",
-        "padded-blocks": "off",
-        "prefer-arrow-callback": "off",
-        "prefer-const": "error",
-        "prefer-reflect": "off",
-        "prefer-rest-params": "error",
-        "prefer-spread": "off",
-        "prefer-template": "off",
-        "quote-props": "error",
-        "quotes": "off",
-        "radix": "error",
-        "require-jsdoc": "off",
-        "rest-spread-spacing": "error",
-        "semi": "error",
-        "semi-spacing": [
-            "error",
-            {
-                "after": true,
-                "before": false
-            }
-        ],
-        "sort-imports": "error",
-        "sort-vars": "error",
-        "space-before-blocks": "error",
-        "space-before-function-paren": "off",
-        "space-in-parens": "off",
-        "space-infix-ops": "off",
-        "space-unary-ops": [
-            "error",
-            {
-                "nonwords": false,
-                "words": false
-            }
-        ],
-        "spaced-comment": "off",
-        "strict": [
-            "error",
-            "never"
-        ],
-        "template-curly-spacing": "error",
-        "unicode-bom": [
-            "error",
-            "never"
-        ],
-        "valid-jsdoc": "error",
-        "vars-on-top": "off",
-        "wrap-iife": "error",
-        "wrap-regex": "error",
-        "yield-star-spacing": "error",
-        "yoda": [
-            "error",
-            "never"
-        ]
-    }
-};
+  parser: "babel-eslint",
+  env: {
+    browser: true,
+    es6: true,
+    node: true
+  },
+  rules: {
+    indent: [
+      "error",
+      2
+    ],
+    quotes: [2, "single"],
+    'comma-dangle': ["error", "never"],
+    'linebreak-style': [
+      "error",
+      "unix"
+    ],
+    quotes: [
+      "off"
+    ],
+    semi: [
+      "error",
+      "never"
+    ],
+    'no-console': [
+      "off"
+	    ],
+    'no-restricted-imports': [0]
+  }
+}
\ No newline at end of file
diff --git a/.gitignore b/.gitignore
index 17cf94b..355fc70 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,5 +2,5 @@ node_modules
 npm-debug.log
 *.swp
 .DS_Store
-test.js
-package-lock.json
\ No newline at end of file
+package-lock.json
+playground
\ No newline at end of file
diff --git a/.npmignore b/.npmignore
index 854b14a..45d0037 100644
--- a/.npmignore
+++ b/.npmignore
@@ -1,14 +1,14 @@
 node_modules
-npm-debug.log
 test
+playground
+npm-debug.log
 .coveralls.yml
 .eslintrc.js
 .travis.yml
 .babelrc
+.vscode
 *.swp
 .DS_Store
 webpack.config.js
-test.js
-.vscode
 spellbook.js
 package-lock.json
\ No newline at end of file
diff --git a/.travis.yml b/.travis.yml
index 8b5fff0..32b3976 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,9 +1,6 @@
 language: node_js
 node_js:
   - "node"
+  - "8"
   - "7"
-  - "6"
-  - "5"
-  - "4"
-  - '0.12'
-  - "iojs"
\ No newline at end of file
+  - "6"
\ No newline at end of file
diff --git a/.vscode/launch.json b/.vscode/launch.json
index 34e1913..0690483 100644
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@@ -5,7 +5,7 @@
       "type": "node",
       "request": "launch",
       "name": "Node.js",
-      "program": "${workspaceRoot}/spellbook.js"
+      "program": "${workspaceRoot}/src/main.js"
     }
   ]
 }
\ No newline at end of file
diff --git a/README.md b/README.md
index 54643d9..4ad4416 100644
--- a/README.md
+++ b/README.md
@@ -2,13 +2,13 @@ Spellbook
 ===
 > Functional and asynchronous conjurations for Javascript
 
-http://www.spellbook.io
+http://spellbook.io
 
 [![npm version](https://badge.fury.io/js/spellbook.svg)](https://badge.fury.io/js/spellbook) [![GitHub version](https://badge.fury.io/gh/warlock%2Fspellbook.svg)](https://badge.fury.io/gh/warlock%2Fspellbook) [![Build Status](https://travis-ci.org/warlock/spellbook.svg?branch=master)](https://travis-ci.org/warlock/spellbook) [![Known Vulnerabilities](https://snyk.io/test/github/warlock/spellbook/badge.svg)](https://snyk.io/test/github/warlock/spellbook)
 
 ## INSTALL/DOWNLOAD
 ```sh
-npm install spellbook
+npm install spellbook -S
 ```
 
 ## MINIFIED CDN
@@ -28,11 +28,11 @@ https://github.com/warlock/spellbook
 
 ## Node.Js : Import module:
 ```javascript
-var sb = require("spellbook");
+const sb = require("spellbook")
 ```
 
 ## Web : Import module:
-```javascript
+```html
 <script src="spellbook/spellbook.js"></script>
 <script>
 let a = sb.chain([{ a : 'hi', b : 3 }, { a : "hello", b : 3 }, { a : "bye", b : 2 }])
@@ -49,28 +49,28 @@ console.log(a)
 # Generic tools
 **Range:**
 ```javascript
-sb.range(0,10);
+sb.range(0,10)
 ```
 ```
 -> [0,1,2,3,4,5,6,7,8,9,10]
 ```
 
 ```javascript
-sb.range(-100,100,20);
+sb.range(-100,100,20)
 ```
 ```
 -> [-100,-80,-60,-40,-20,0,20,40,60,80,100]
 ```
 
 ```javascript
-sb.range('A','F');
+sb.range('A','F')
 ```
 ```
 -> ['A','B','C','D','E','F')
 ```
 
 ```javascript
-sb.range('m','r');
+sb.range('m','r')
 ```
 ```
 -> ['m','n','o','p','q','r']
@@ -78,48 +78,48 @@ sb.range('m','r');
 
 **Random:**
 ```javascript
-sb.random(0,10);
+sb.random(0,10)
 ```
 ```
 -> 3
 ```
 
 ```javascript
-sb.random(['a','b','c']);
+sb.random(['a','b','c'])
 ```
 ```
 -> a
 ```
 
-**sb.shuffle(array);**
+**sb.shuffle(array)**
 ```javascript
-sb.shuffle(['a', 'b', 'c']);
+sb.shuffle(['a', 'b', 'c'])
 ```
 ```
 -> ['c', 'a', 'b']
 ```
 
-**sb.first(array);**
+**sb.first(array)**
 ```javascript
-sb.first(['a', 'b', 'c']);
+sb.first(['a', 'b', 'c'])
 ```
 ```
 -> a
 ```
 
-**sb.last(array);**
+**sb.last(array)**
 ```javascript
-sb.last(['a', 'b', 'c']);
+sb.last(['a', 'b', 'c'])
 ```
 ```
 -> c
 ```
 
-**sb.extend(obj, obj2);**
+**sb.extend(obj, obj2)**
 ```javascript
-var spells = {"fire": 5, "ice": 4};
-var newspells = {"electro": 6, "wind": 7};
-sb.extend(spells, newspells);
+const spells = {"fire": 5, "ice": 4}
+const newspells = {"electro": 6, "wind": 7}
+sb.extend(spells, newspells)
 ```
 ```
 -> {"fire": 5, "ice": 4, "electro": 6, "wind": 7}
@@ -127,34 +127,47 @@ sb.extend(spells, newspells);
 
 **Clone Object in javascript ES5 with ES6 style:**
 ```javascript
-var NewObject = sb.assing(obj);
-var NewObject = sb.clone(obj);
+const NewObject = sb.assing(obj)
+const NewObject2 = sb.clone(NewObject)
 ```
 
 **Remove Objects from Array:**
 ```javascript
-sb.remove(array, obj);
+sb.remove(array, obj)
 ```
 Can remove multiple objects.
 ```javascript
-sb.remove(array, [obj, obj2]);
+sb.remove(array, [obj, obj2])
 ```
 
 **Clear all values from Array:**
 ```javascript
-sb.clear(array);
+sb.clear(array)
 ```
 
 **Find value in Array:**
 ```javascript
-sb.contains(array, item);
-sb.inArray(array, item);
+sb.contains(array, item)
+sb.inArray(array, item)
+```
+
+**Get the element from the object "obj":**
+```javascript
+const a = {
+    a : {
+        b : ["c", "d"]
+    }
+}
+sb.get(a, "a.b.1")
+```
+```
+-> d
 ```
 
-**Check empty values (null, "", [], undefined)**
+**Check empty values (null, '', [], undefined)**
 ```javascript
-var a = ""
-if (sb.empty(a)) return true
+const a = ''
+if (sb.isEmpty(a)) return true
 ```
 ```
 -> true
@@ -162,25 +175,26 @@ if (sb.empty(a)) return true
 
 sb.empty && sb.get combination:
 ```javascript
-var a = { a : [{ a : [1, 2, 3]}], b : 4 }
-if (sb.empty(sb.get('a', 'a.0.a.1'))) return true
+const a = { a : [{ a : [1, 2, 3]}], b : 4 }
+sb.empty(sb.get(a, 'a.0.a.1'))
 ```
 ```
 -> false
 ```
 
+sb.empty && sb.get CHAIN combination:
 ```javascript
-var a = { a : [{ a : [1, 2, 3]}], b : 4 }
-if (sb.empty(sb.get('a', 'a.0.b.1'))) return true
+const a = { a : [{ a : [1, 2, 3]}], b : 4 }
+sb.chain(a).get('a.0.a.1').isEmpty().value()
 ```
 ```
--> true
+-> false
 ```
 
-Can negate a sb.empty in same example:
+sb.empty && sb.get SHORT combination:
 ```javascript
-var a = { a : [{ a : [1, 2, 3]}], b : 4 }
-return !sb.empty(sb.get('a', 'a.0.b.1'))
+const a = { a : [{ a : [1, 2, 3]}], b : 4 }
+sb.e(a, 'a.0.a.1')
 ```
 ```
 -> false
@@ -190,8 +204,8 @@ return !sb.empty(sb.get('a', 'a.0.b.1'))
 
 Alternative name: unq.
 ```javascript
-var spells = [{ name : "fire", damage : 5 },{ name : "ice", damage : 4 }];
-sb.uniq(spells,"name");
+const spells = [{ name : "fire", damage : 5 },{ name : "ice", damage : 4 }]
+sb.uniq(spells, 'name')
 ```
 ```
 -> [ 'fire', 'ice' ]
@@ -200,178 +214,166 @@ sb.uniq(spells,"name");
 **Filter specific values from array of objects**
 
 ```javascript
-var spells = [{ name : "fire", damage : 5 },{ name : "ice", damage : 4 }, { name : "water", damage : 5 }];
-sb.filter(spells,{ damage : 5 });
+const spells = [{ name : "fire", damage : 5 },{ name : "ice", damage : 4 }, { name : "water", damage : 5 }]
+sb.filter(spells,{ damage : 5 })
 ```
 ```
 -> [{ name : "fire", damage : 5 },{ name : "water", damage : 5 }]
 ```
 
 ```javascript
-var spells = [{ name : "fire", damage : 5 },{ name : "ice", damage : 4 }, { name : "water", damage : 5 }];
-sb.filter(spells,{ name : "fire", name : "ice" });
+const spells = [{ name : "fire", damage : 5 },{ name : "ice", damage : 4 }, { name : "water", damage : 5 }]
+sb.filter(spells,{ name : "fire", name : "ice" })
 ```
 ```
 -> [{ name : "fire", damage : 5 },{ name : "ice", damage : 4 }]
 ```
 
-
-**Get the element from the object "obj":**
-```javascript
-var a = {
-    a : {
-        b : ["c", "d"]
-    }
-};
-sb.get(a, "a.b.1");
-```
-```
--> d
-```
-
 **Get object size**
 ```javascript
-var obj = { name : "fire", damage : 5};
+const obj = { name : "fire", damage : 5 }
 sb.size(obj)
 ```
 ```
 -> 2
 ```
 
-**sb.getKeys(object, keys);**
+**sb.getKeys(object, keys)**
 ```javascript
-var spells = {"fire": 5, "ice": 4, "electro": 6, "wind": 7};
-sb.getKeys(spells, "fire");
+const spells = { "fire": 5, "ice": 4, "electro": 6, "wind": 7 }
+sb.getKeys(spells, "fire")
 ```
 ```
 -> {"fire": 5}
 ```
 
 ```javascript
-var spells = {"fire": 5, "ice": 4, "electro": 6, "wind": 7};
-sb.getKeys(spells, ["fire", "wind"]);
+const spells = { "fire": 5, "ice": 4, "electro": 6, "wind": 7 }
+sb.getKeys(spells, ["fire", "wind"])
 ```
 ```
 -> {"fire": 5, "wind" : 7}
 ```
 
-**sb.repeatify(value, num);**
+**sb.repeatify(value, num)**
 ```
-sb.reatify("hi", 5);
+sb.reatify("hi", 5)
 ```
 ```
 -> ['hi','hi','hi','hi','hi']
 ```
 
-**sb.capitalize();**
+**sb.capitalize()**
 ```javascript
-sb.capitalize("abracadabra");
+sb.capitalize("abracadabra")
 ```
 ```
 -> Abracadabra
 ```
 
-**sb.dos2unix(string);**
+**sb.dos2unix(string)**
 Replace dos endline
 
 ```javascript
-sb.dos2unix(string);
+sb.dos2unix(string)
 ```
 
 **Type check:**
 ```javascript
-sb.isFunction(obj);
-sb.isArray(obj);
-sb.isObject(obj);
-sb.isNumber(obj);
-sb.isInteger(obj);
-sb.isString(obj);
-sb.isBoolean(obj);
+sb.isFunction(obj)
+sb.isArray(obj)
+sb.isObject(obj)
+sb.isNumber(obj)
+sb.isInteger(obj)
+sb.isString(obj)
+sb.isBoolean(obj)
+sb.isEmpty(obj)
+sb.isUndefined(obj)
+sb.isNull(obj)
+sb.isNaN(obj)
 ```
 
 
 # Asyncronous Iterators
 
-**sb.each(array, callback_loop(item, index, next_method, end_method), callback_end);**
+**sb.each(array, callback_loop(item, index, next_method, end_method), callback_end)**
 
 Runs next function when "next" method is executed.
 ```javascript
-var list = ['a', 'b', 'c'];
-sb.each(list, function (item, i, next, end) {
-    console.log("item: " + item );
-    setTimeout(function () {
-        next();
-    }, 3000);
-}, function () {
-    console.log("End");
-});
+const list = ['a', 'b', 'c']
+
+sb.each(list, (item, index, next, end) => {
+  console.log(`item: ${item}`)
+  setTimeout(next, 3000)
+}, () => {
+  console.log(`End`)
+})
 ```
 ```
--> item: a // Wait 3 seconds;
--> item: b // Wait 3 seconds;
--> item: c // Wait 3 seconds;
+-> item: a // Wait 3 seconds
+-> item: b // Wait 3 seconds
+-> item: c // Wait 3 seconds
 -> End
 ```
 
 Call "end" method for break the loop.
 ```javascript
-var list = ['a', 'b', 'c'];
-sb.each(list, function (item, i, next, end) {
-    console.log("item: " + item );
-    setTimeout(function () {
-        if (i === 1) end("Bye!");
-        else next();
-    }, 3000);
-}, function (data) {
-    if (data) console.log("End: " + data);
-    else console.log("End");
-});
-```
-```
--> item: a // Wait 3 seconds;
--> item: b // Wait 3 seconds;
+const list = ['a', 'b', 'c']
+
+sb.each(list, (item, index, next, end) => {
+  console.log(`item: ${item}`)
+  setTimeout(() => {
+    if (index === 1) end(`Bye!`)
+    else next()
+  }, 3000)
+}, data => {
+  if (data) console.log(`End: ${data}`)
+  else console.log(`End`)
+})
+```
+```
+-> item: a // Wait 3 seconds
+-> item: b // Wait 3 seconds
 -> End: Bye!
 ```
 
-**sb.eachParallelLimit(array, number_limit, callback_loop(item, index, next_method), callback_end);**
+**sb.eachParallelLimit(array, number_limit, callback_loop(item, index, next_method), callback_end)**
 
 Runs in parallel limit and next loop when "next" method is executed. Alternative names: eachpl, epl.
 ```javascript
-var list = ['a', 'b', 'c', 'd'];
-sb.epl(list, 2, function (item, i, next) {
-    console.log("item: " + item );
-    setTimeout(function () {
-        next();
-    }, 2000);
-}, function () {
-    console.log("End");
-});
+const list = ['a', 'b', 'c', 'd']
+sb.epl(list, 2, (item, index, next) => {
+  console.log(`item: ${item}`)
+  setTimeout(next, 2000)
+}, () => {
+  console.log('End')
+})
 ```
 ```
 -> item: a
 -> item: b
--> item: c // Next to start when next method executed;
--> item: d // Next to start when next method executed;
+-> item: c // Next to start when next method executed
+-> item: d // Next to start when next method executed
 -> End
 ```
 
-**sb.waterfall(array_functions(done, data), callback_end);**
+**sb.waterfall(array_functions(done, data), callback_end)**
 
 Runs next function when "done" method is executed.
 Alternative name: wf.
 ```javascript
 sb.waterfall([
-    function (done) {
-        console.log("fire");
-        done(5);
-    },
-    function (done, data) {
-        console.log("ice: " + data);
-        done("win");
-    }
-], function (data) {
-    console.log("End: " + data);
-});
+  done => {
+    console.log(`fire`)
+    done(5)
+  },
+  (done, data) => {
+    console.log(`ice: ${data}`)
+    done(`win`)
+  }
+], data => {
+  console.log(`End: ${data}`)
+})
 ```
 ```
 -> fire
@@ -382,17 +384,17 @@ sb.waterfall([
 Break the waterfall with "true".
 ```javascript
 sb.wf([
-    function (done) {
-        console.log("fire");
-        done(true, 5);
-    },
-    function (done, data) {
-        console.log("ice: " + data);
-        done("win");
-    }
-], function (data) {
-    console.log("End: " + data);
-});
+  done => {
+    console.log(`fire`)
+    done(true, 5)
+  },
+  (done, data) => {
+    console.log(`ice: ${data}`)
+    done(`win`)
+  }
+], data => {
+  console.log(`End: ${data}`)
+})
 ```
 ```
 -> fire
@@ -400,32 +402,32 @@ sb.wf([
 ```
 
 
-**sb.parallel(array_functions(done), callback_end(data));**
+**sb.parallel(array_functions(done), callback_end(data))**
 
 Run functions in parallel and then execute "callback_end".
 ```javascript
 sb.parallel([
-    function (done) {
-        setTimeout(function () {
-            console.log("hi 3!");
-            done("a")
-        }, 3000);
-    },
-    function (done) {
-        setTimeout(function () {
-            console.log("hi 2!");
-            done("b");
-        }, 2000);
-    },
-    function (done) {
-        setTimeout(function () {
-            console.log("hi 1!");
-            done("c");
-        }, 1000);
-    }
-],function (data) {
-        console.log("End: " + JSON.stringify(data));
-});
+  done => {
+    setTimeout(() => {
+      console.log(`hi 3!`)
+      done(`a`)
+    }, 3000)
+  },
+  done => {
+    setTimeout(() => {
+      console.log(`hi 2!`)
+      done(`b`)
+    }, 2000)
+  },
+  done => {
+    setTimeout(() => {
+      console.log(`hi 1!`)
+      done(`c`)
+    }, 1000)
+  }
+],data => {
+  console.log(`End: ${JSON.stringify(data)}`)
+})
 ```
 ```
 //Wait 1 second
@@ -435,65 +437,68 @@ sb.parallel([
 -> End: ["a","b","c"]
 ```
 
-**sb.parallelLimit(number, array_functions(done), callback_end(data));**
+**sb.parallelLimit(number, array_functions(done), callback_end(data))**
 
 Run limit of functions in parallel and then execute "callback_end". Alternative name : pl
 ```javascript
 sb.pl(2, [
-    function (done) {
-        setTimeout(function () {
-          console.log("go 1!");
-          done("a")
-        }, 1000);
-    },
-    function (done) {
-        setTimeout(function () {
-        console.log("go 2!");
-        done("b")
-    }, 3000); },
-    function (done) {
-        setTimeout(function () {
-            console.log("go 3!");
-            done("c")
-        }, 1000);
-    },
-    function (done) {
-        setTimeout(function () {
-            console.log("go 4!");
-            done("a2")
-        }, 3000);
-    },
-    function (done) {
-        setTimeout(function () {
-            console.log("go 5!");
-            done("b2")
-        }, 1000);
-    },
-    function (done) {
-        setTimeout(function () {
-            console.log("go 6!");
-            done("c2")
-        }, 3000); },
-    function (done) {
-        setTimeout(function () {
-            console.log("go 7!");
-            done("a3")
-        }, 1000); },
-    function (done) {
-        setTimeout(function () {
-            console.log("go 8!");
-            done("b3")
-        }, 3000);
-    },
-    function (done) {
-        setTimeout(function () {
-            console.log("go 9!");
-            done("c3")
-        }, 1000);
-    }
-],function (data) {
-    console.log("we: " + JSON.stringify(data));
-});
+  done => {
+    setTimeout(() => {
+      console.log("go 1!")
+      done("a")
+    }, 1000)
+  },
+  done => {
+    setTimeout(() => {
+      console.log("go 2!")
+      done("b")
+    }, 3000)
+  },
+  done => {
+    setTimeout(() => {
+      console.log("go 3!")
+      done("c")
+    }, 1000)
+  },
+  done => {
+    setTimeout(() => {
+      console.log("go 4!")
+      done("a2")
+    }, 3000)
+  },
+  done => {
+    setTimeout(() => {
+      console.log("go 5!")
+      done("b2")
+    }, 1000)
+  },
+  done => {
+    setTimeout(() => {
+      console.log("go 6!")
+      done("c2")
+   }, 3000)
+  },
+  done => {
+    setTimeout(() => {
+      console.log("go 7!")
+      done("a3")
+    }, 1000)
+  },
+  done => {
+    setTimeout(() => {
+      console.log("go 8!")
+      done("b3")
+    }, 3000)
+  },
+  done => {
+    setTimeout(() => {
+       console.log("go 9!")
+       done("c3")
+    }, 1000)
+  }
+],data => {
+  console.log(`we: ${JSON.stringify(data)}`)
+})
 ```
 ```
 -> go 1!
@@ -508,57 +513,53 @@ sb.pl(2, [
 -> we: ["a","b","c","a2","b2","c2","a3","b3","c3"]
 ```
 
-**sb.forever(callback(next, end), callback_end);**
+**sb.forever(callback(repeat, end), callback_end)**
 
 Loops syncronous forever.
 Alternative name: fe.
 
 ```javascript
-sb.forever(function (next, end) {
-    console.log("Hi!")
-    setTimeout(function () {
-        next();
-    }, 3000);
-});
+sb.forever((repeat, end) => {
+  console.log(`Hi!`)
+  setTimeout(repeat, 3000)
+})
 ```
 ```
--> Hi! // Wait 3 seconds;
--> Hi! // Wait 3 seconds;
+-> Hi! // Wait 3 seconds
+-> Hi! // Wait 3 seconds
 -> ...
 ```
 
 Breaking forever loop.
 ```javascript
-var i = 0;
-sb.fe(function (next, end) {
-    console.log("loop: " + i);
-    if (i>=3) end("Now Break!!");
-    i++;
-    setTimeout(function () {
-        next();
-    }, 3000);
-}, function (data) {
-    console.log("Response: " + data);
-});
-```
-```
--> loop: 0 // Wait 3 seconds;
--> loop: 1 // Wait 3 seconds;
--> loop: 2 // Wait 3 seconds;
--> loop: 3 // Wait 3 seconds;
+var i = 0
+sb.fe((repeat, end) => {
+  console.log(`loop: ${i}`)
+  if (i>=3) end(`Now Break!!!`)
+  i++
+  setTimeout(repeat, 3000)
+}, data => {
+  console.log(`Response: ${data}`)
+})
+```
+```
+-> loop: 0 // Wait 3 seconds
+-> loop: 1 // Wait 3 seconds
+-> loop: 2 // Wait 3 seconds
+-> loop: 3 // Wait 3 seconds
 -> Response: Now Break!!
 ```
 
-**sb.times(number, callback(index, next, end), end);**
+**sb.times(number, callback(index, next, end), end)**
 
 Iterates function "number" times.
 ```javascript
-sb.times(5, function (index, next, end) {
-        console.log("iterator: " + index);
-        if (index === 3) end()
-        else next();
+sb.times(5, (index, next, end) => {
+  console.log(`Iterator: ${index}`)
+  if (index === 3) end()
+  else next()
 }, () => {
-        console.log("End!")
+  console.log(`End!`)
 })
 ```
 ```
@@ -570,9 +571,9 @@ sb.times(5, function (index, next, end) {
 ```
 
 ```javascript
-sb.times(5, function (index, next, end) {
-        console.log("Iterator " + index);
-        next();
+sb.times(5, (index, next, end) => {
+  console.log(`Iterator ${index}`)
+  next()
 })
 ```
 ```
@@ -584,17 +585,17 @@ sb.times(5, function (index, next, end) {
 -> Iterator 5
 ```
 
-**sb.for(initial, final, increment, callback(index, next, end), callback_end(data));**
+**sb.for(initial, final, increment, callback(index, next, end), callback_end(data))**
 
 Syncronous "for" iterator.
 Alternative name: forSync.
 
 ```javascript
-sb.for(0, 10, 1, function (index, next, end) {
-    console.log(index)
-    next(5)
-}, function (data) {
-    console.log(data)
+sb.for(0, 10, 1, (index, next, end) => {
+  console.log(index)
+  next(5)
+}, data => {
+  console.log(data)
 })
 ```
 ```
@@ -609,15 +610,33 @@ sb.for(0, 10, 1, function (index, next, end) {
 -> 8
 -> 9
 -> 10
--> [ 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5 ]
+-> [ 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5 ]
+```
+
+```javascript
+sb.for(1, 10, 2, (index, next, end) => {
+  console.log(index)
+  next(index)
+}, data => {
+  console.log(data)
+})
+```
+```
+-> 1
+-> 3
+-> 5
+-> 7
+-> 9
+-> 11
+-> [ 1, 3, 5, 7, 9, 11 ]
 ```
 
-#Events and much more... http://www.spellbook.io
+# Events and much more... http://spellbook.io
 
 
 ## License
 The MIT License (MIT)
-Copyright (c) 2015 Josep Subils (josep@spellbook.io)
+Copyright (c) 2015 Josep Subils (js@js.gl)
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 
diff --git a/package.json b/package.json
index 0ef4102..ca26277 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "spellbook",
-  "version": "1.0.4",
+  "version": "1.1.0",
   "description": "Functional and asynchronous conjurations for Javascript",
   "main": "src/main.js",
   "scripts": {
@@ -31,33 +31,32 @@
     "tools",
     "utils"
   ],
-  "author": "Josep Subils Rigau <josep@spellbook.io> (http://spellbook.io)",
+  "author": "Josep Subils Rigau <josep@js.gl> (http://js.gl)",
   "license": "MIT",
   "bugs": {
     "url": "https://github.com/warlock/spellbook/issues"
   },
   "homepage": "http://www.spellbook.io",
   "dependencies": {
+    "eem": "*",
     "snc": "*",
     "tck": "*"
   },
   "devDependencies": {
-    "chai": "^4.1.0",
-    "coveralls": "^2.13.1",
-    "eslint": "^4.3.0",
-    "eslint-plugin-mocha": "^4.11.0",
-    "istanbul": "^0.4.5",
-    "mocha": "^3.4.2",
-    "mocha-eslint": "^4.0.0",
-    "mocha-jshint": "^2.3.1",
-    "babel-core": "^6.25.0",
-    "babel-eslint": "^7.2.3",
-    "babel-loader": "^7.1.1",
+    "babel-core": "^6.26.0",
+    "babel-eslint": "^8.0.1",
+    "babel-loader": "^7.1.2",
     "babel-plugin-transform-runtime": "^6.23.0",
     "babel-preset-env": "^1.6.0",
     "babel-preset-es2015": "^6.24.1",
-    "babel-preset-stage-2": "^6.24.1",
-    "babel-register": "^6.24.1",
-    "webpack": "^3.4.1"
+    "babel-register": "^6.26.0",
+    "chai": "^4.1.2",
+    "coveralls": "^2.13.1",
+    "eslint": "^4.7.2",
+    "eslint-plugin-mocha": "^4.11.0",
+    "istanbul": "^0.4.5",
+    "mocha": "^3.5.3",
+    "mocha-eslint": "^4.1.0",
+    "webpack": "^3.6.0"
   }
 }
diff --git a/spellbook.js b/spellbook.js
index 5ab584d..d1cebac 100644
--- a/spellbook.js
+++ b/spellbook.js
@@ -1 +1 @@
-!function(t,n){"object"==typeof exports&&"object"==typeof module?module.exports=n():"function"==typeof define&&define.amd?define([],n):"object"==typeof exports?exports.sb=n():t.sb=n()}(this,function(){return function(t){function n(r){if(i[r])return i[r].exports;var e=i[r]={i:r,l:!1,exports:{}};return t[r].call(e.exports,e,e.exports,n),e.l=!0,e.exports}var i={};return n.m=t,n.c=i,n.d=function(t,i,r){n.o(t,i)||Object.defineProperty(t,i,{configurable:!1,enumerable:!0,get:r})},n.n=function(t){var i=t&&t.__esModule?function(){return t.default}:function(){return t};return n.d(i,"a",i),i},n.o=function(t,n){return Object.prototype.hasOwnProperty.call(t,n)},n.p="",n(n.s=10)}([function(t,n){var i={isFunction:function(t){return"function"==typeof t},isArray:function(t){return"object"==typeof t&&t instanceof Array},isObject:function(t){return"object"==typeof t&&!(t instanceof Array)&&null!==t},isNumber:function(t){return"number"==typeof t||t instanceof Number},isInteger:function(t){return!!i.isNumber(t)&&t%1==0},isString:function(t){return"string"==typeof t||t instanceof String},isBoolean:function(t){return"boolean"==typeof t},isEmpty:function(t){return i.isUndefined(t)||i.isNull(t)||""===t},isNull:function(t){return null===t},isNaN:function(t){return isNaN(t)},isUndefined:function(t){return void 0===t}};t.exports=i},function(t,n,i){var r=i(0);t.exports={extend:function(t,n){for(var i in n)n.hasOwnProperty(i)&&(t[i]=n[i]);return t},assign:function(t){if(null===t||"object"!=typeof t||"isActiveClone"in t)return t;var n=t.constructor();for(var i in t)Object.prototype.hasOwnProperty.call(t,i)&&(t.isActiveClone=null,n[i]=t[i],delete t.isActiveClone);return n},get:function(t,n){if(void 0!==t&&"string"==typeof n){if(n=n.split("."),1===n.length)return t[n[0]];for(var i=0;i<n.length;i++){if(void 0===t[n[i]])return;t=t[n[i]]}return t}},keys:function(t){return Object.keys(t)},getKeys:function(t,n){var i={};return r.isArray(n)?n.forEach(function(n){i[n]=t[n]}):i[n]=t[n],i},merge:function(t,n){var i={};if(r.isObject(t)&&r.isObject(n))return Object.keys(t).forEach(function(n){i[n]=t[n]}),Object.keys(n).forEach(function(t){i[t]=n[t]}),i;throw new Error("Merge option need two objects for work")}}},function(t,n,i){(function(n){var i={each:function(t,n,i){var r=0,e=[],o=function(s){if(void 0!==s&&null!==s&&(e[r-1]=s),r<t.length){var u=r;r++,n(t[u],u,o,a)}else"function"==typeof i&&i(e)},a=function(t){"function"==typeof i&&i(t)};r<t.length?o():"function"==typeof i&&i(e)},waterfall:function(t,n){var i=0,r=function(e,o){i<t.length-1?(i++,null!==e&&void 0!==e?!0===e?"function"==typeof n&&n(o):t[i](r,e):t[i](r)):"function"==typeof n&&(null!==e&&void 0!==e?n(!0===e?o:e):n())};t instanceof Array&&t[i](r)},forever:function(t,n){var i=function(t){"function"==typeof n&&n(t)},r=function(){t(r,i)};t(r,i)},parallelLimit:function(t,n,i){var r=0,e=n.length,o=[],a=function(t){var s=function(s){e--,null!==s&&void 0!==s&&(o[t]=s),r!==n.length?(a(r),r++):0===e&&"function"==typeof i&&i(o)};n[t](s)};if(n instanceof Array)for(var s=0;s<t;s++)a(s),r++},forSync:function(t,n,i,r,e){var o=[],a=function(s){null!==s&&void 0!==s&&o.push(s),t<n?(t+=i,r(t,a,e)):"function"==typeof e&&e(o)};r(t,a,e)},eachParallelLimit:function(t,n,i,r){var e=0,o=t.length,a=[],s=function(n,u){i(n,u,function(n){o--,null!==n&&void 0!==n&&(a[u]=n),e!==t.length?(s(t[e],e),e++):0===o&&"function"==typeof r&&r(a)},function(t){"function"==typeof r&&r(t)})};if(t instanceof Array&&t.length>0){n>t.length&&(n=t.length);for(var u=0;u<n;u++)s(t[u],u),e++}else"function"==typeof r&&r(a)},times:function(t,n,r){i.forSync(0,t-1,1,n,r)},parallel:function(t,n){var i=0,r=[];if(t instanceof Array)for(var e=0;e<t.length;e++)!function(e){var o=function(o){null!==o&&void 0!==o&&(r[e]=o),i<t.length-1?i++:"function"==typeof n&&n(r)};t[e](o)}(e)}};i.eachpl=i.eachParallelLimit,i.epl=i.eachParallelLimit,i.wf=i.waterfall,i.pl=i.parallelLimit,i.fe=i.forever,i.for=i.forSync,"object"==typeof n&&(t.exports=i)}).call(n,i(11))},function(t,n,i){var r=i(0);t.exports={range:function(t,n,i){var e=[];if(r.isEmpty(t)||r.isEmpty(n))return[];if(typeof t!=typeof n)return[];if(r.isNumber(t))for(e[0]=t,i=i||1;t+i<=n;)e[e.length]=t+=i;else{var o="abcdefghijklmnopqrstuvwxyz";t===t.toUpperCase()&&(n=n.toUpperCase(),o=o.toUpperCase()),o=o.substring(o.indexOf(t),o.indexOf(n)+1),e=o.split("")}return e},random:function(t,n){if(r.isNumber(t)&&r.isNumber(n))return Math.floor(Math.random()*(n-t))+t;if(r.isArray(t)){return t[Math.floor(Math.random()*t.length)]}return 0},ifElse:function(t,n,i){return t?n():i()},function:function(t,n){return n(t)}}},function(t,n,i){var r=i(0),e=i(1);t.exports={shuffle:function(t){if(r.isArray(t)){for(var n=e.assign(t),i=n.length-1;i>=0;i--){var o=Math.floor(Math.random()*(i+1)),a=n[o];n[o]=n[i],n[i]=a}return n}throw new Error("Shuffle function not contains array.")},first:function(t){if(r.isArray(t))return t[0];throw new Error("first function not contains array.")},last:function(t){if(r.isArray(t))return t[t.length-1];throw new Error("Last function not contains array.")},remove:function(t,n){function i(t,n){return t.filter(function(t){if(JSON.stringify(t)!==JSON.stringify(n))return t})}var o=e.assign(t);return r.isArray(n)?(n.forEach(function(t){o=i(o,t)}),o):i(o,n)},clear:function(t){var n=e.assign(t);if(r.isArray(n))return n.splice(n.length,0);throw new Error("clear function not contains array.")},inArray:function(t,n){if(r.isArray(t))return!!~t.indexOf(n);throw new Error("inArray function not contains array.")},uniqBy:function(t,n){if(r.isArray(t)){for(var i=[],e={},o=0;o<t.length;o++)void 0===e[t[o][n]]&&void 0!==t[o][n]&&(i.push(t[o][n]),e[t[o][n]]=1);return i}throw new Error("uniq function not contains array.")},uniq:function(t){for(var n=[],i=0;i<t.length;i++)(function(t,n){for(var i=0;i<t.length;i++)if(JSON.stringify(t[i])===JSON.stringify(n))return!0;return!1})(n,t[i])||n.push(t[i]);return n},filter:function(t,n){if(r.isEmpty(t))throw new Error("filter function not contains array.");if(r.isEmpty(n)&&"function"!=typeof obj)throw new Error("Find in array need a object.");return t.filter(n)},filterBy:function(t,n){if(r.isEmpty(t))throw new Error("filter function not contains array.");if(r.isEmpty(n)&&"object"!=typeof n)throw new Error("Find in array need a object.");var i=Object.keys(n);return t.filter(function(t){var r=!0;return i.forEach(function(i){"string"==typeof t[i]?t[i].indexOf(n[i])<0&&(r=!1):t[i]!==n[i]&&(r=!1)}),r})},map:function(t,n){if(r.isArray(t)){if(r.isFunction(n))return t.map(n);throw new Error("map function not contains callback.")}throw new Error("map function not contains array.")},reduce:function(t,n){if(r.isArray(t))return r.isFunction(n)?t.reduce(n):t.sort(t);throw new Error("reduce function not contains array.")},forEach:function(t,n){if(!r.isArray(t))throw new Error("forEach function not contains array.");if(!r.isFunction(n))return t.sort(t);t.forEach(n)},sort:function(t,n){if(r.isArray(t))return r.isFunction(n)?t.sort(n):t.sort(t);throw new Error("sort function not contains array.")}}},function(t,n,i){var r=i(0);t.exports={toInt:function(t){if(r.isEmpty(t))throw new Error("To int needs an string value.");if(r.isString(t))return parseInt(t,10);throw new Error("toInt function has incompatible value.")},dos2unix:function(t){if(r.isEmpty(t))throw new Error("Dos2unix function needs an string value.");if(r.isString(t))return t.replace(/\r\n/g,"\n");throw new Error("Dos2unix function has incompatible value.")},capitalize:function(t){if(r.isEmpty(t))throw new Error("Capitalize function needs an string value.");if(r.isString(t))return t.slice(0,1).toUpperCase()+t.slice(1);throw new Error("Capitalize function has incompatible value.")},excerpt:function(t,n){var i=t.split(" ");return i.splice(n,i.length-1),i.join(" ")},toJSON:function(t){if(r.isEmpty(t))throw new Error("toJSON function needs an string value.");if(r.isString(t))return JSON.parse(t);throw new Error("toJSON function has incompatible value.")},json:function(t){if(r.isEmpty(t))throw new Error("toJSON function needs an string value.");if(r.isString(t))return JSON.parse(t);throw new Error("toJSON function has incompatible value.")},split:function(t,n,i){if(r.isEmpty(t))throw new Error("Split function needs an string value.");if(r.isString(t))return t.split(n,i);throw new Error("Split function has incompatible value.")},toLowerCase:function(t){if(r.isEmpty(t))throw new Error("toLowerCase function needs an string value.");if(r.isString(t))return t.toLowerCase();throw new Error("toLowerCase function has incompatible value.")},toUpperCase:function(t){if(r.isEmpty(t))throw new Error("toUpperCase function needs an string value.");if(r.isString(t))return t.toUpperCase();throw new Error("toUpperCase function has incompatible value.")},trim:function(t){if(r.isEmpty(t))throw new Error("trim function needs an string value.");if(r.isString(t))return t.trim();throw new Error("trim function has incompatible value.")},replace:function(t,n,i){if(r.isEmpty(t)&&r.isEmpty(i))throw new Error("replace function needs an string value.");if(r.isString(t)&&r.isString(i))return t.replace(n,i);throw new Error("replace function has incompatible value.")},pad:function(t,n,i){return n>>=0,i=String(i||" "),t.length>n?String(t):(n-=t.length,n>i.length&&(i+=i.repeat(n/i.length)),i.slice(0,n)+String(t))}}},function(t,n,i){var r=i(0);t.exports={duplicate:function(t){if(r.isNumber(t))return 2*t;throw new Error("Duplicate function needs a number.")},min:function(t){if(r.isArray(t)){var n=!0;if(t.forEach(function(t){n&&!r.isNumber(t)&&(n=!1)}),n)return Math.min.apply(Math,t);throw new Error("Min funciton needs an array of numbers.")}throw new Error("Min funciton needs an array.")},max:function(t){if(r.isArray(t)){var n=!0;if(t.forEach(function(t){n&&!r.isNumber(t)&&(n=!1)}),n)return Math.max.apply(Math,t);throw new Error("Min funciton needs an array of numbers.")}throw new Error("Min funciton needs an array.")},sum:function(t,n){if(r.isNumber(t)&&r.isNumber(n))return t+n;throw new Error("Sum function only can operate with numbers.")},divide:function(t,n){if(r.isNumber(t)&&r.isNumber(n))return t/n;throw new Error("Divide function only can operate with numbers.")},mult:function(t,n){if(r.isNumber(t)&&r.isNumber(n))return n*t;throw new Error("Mult function only can operate with numbers.")},ceil:function(t){if(r.isNumber(t))return Math.ceil(t);throw new Error("ceil function only can operate with numbers.")},round:function(t){if(r.isNumber(t))return Math.round(t);throw new Error("round function only can operate with numbers.")},floor:function(t){if(r.isNumber(t))return Math.floor(t);throw new Error("floor function only can operate with numbers.")},trunc:function(t){if(r.isNumber(t))return Math.trunc(t);throw new Error("floor function only can operate with numbers.")}}},function(t,n){t.exports={isTrue:function(t){return!0===t},isFalse:function(t){return!1===t},isEqual:function(t,n){return JSON.stringify(t)===JSON.stringify(n)},not:function(t){return!1===t},and:function(t,n){return!(!t||!n)}}},function(t,n,i){var r=i(0);t.exports={toString:function(t){if(r.isEmpty(t))throw new Error("toString function not contains value to parse.");return JSON.stringify(t)},size:function(t){if(r.isEmpty(t))throw new Error("size function not contains values.");if(r.isArray(t)||r.isString(t))return t.length;if(r.isObject(t))return Object.keys(t).length;throw new Error("size function not contains compatible values.")},contains:function(t,n){if(r.isArray(t)||r.isString(t))return!!~t.indexOf(n);if(r.isObject(t))return!!~Object.keys(t).indexOf(n);throw new Error("contains function not contains values.")},reverse:function(t){if(r.isArray(t))return t.reverse();if(r.isString(t))return t.split("").reverse().join("");throw new Error("Reverse function not contains array or string.")},repeatify:function(t,n){if(r.isEmpty(t))throw new Error("repeatify function not have data for repeat.");if(r.isEmpty(n)||r.isNumber(n))throw new Error("repeatify function not have a number for repeat.");for(var i=[],e=0;e<n;e++)i.push(t);return i},concat:function(t,n){if(r.isEmpty(t)||r.isEmpty(n))throw new Error("concat function not have values.");if(r.isString(t)&&r.isString(t))return t+n;if(r.isArray(t)&&r.isArray(t))return t.concat(n);throw new Error("concat function not contains same values.")},return:function(t){return t}}},function(t,n,i){var r=i(0),e={eventstack:{},on:function(t,n){if(r.isEmpty(t))throw new Error("on function need event");if(r.isArray(t))for(var i=0;i<t.length;i++){if(!r.isFunction(n))throw Error("Event need function");e.eventstack[t[i]]=n}else{if(!r.isFunction(n))throw Error("Event need function");e.eventstack[t]=n}},emit:function(t,n){if(r.isEmpty(t))throw new Error("No event selected.");if(r.isArray(t))for(var i=0;i<t.length;i++)r.isFunction(e.eventstack[t[i]])&&e.eventstack[t[i]](n,this.data);else r.isFunction(e.eventstack[t])&&e.eventstack[t](n,this.data)},delete:function(t){if(r.isEmpty(t))throw new Error("No event selected.");if(r.isEmpty(e.eventstack[t]))throw Error("This event not exist");delete e.eventstack[t]}};t.exports=e},function(t,n,i){var r=i(2),e=i(0),o=i(3),a=i(4),s=i(1),u=i(5),f=i(6),c=i(7),h=i(8),l=i(9),d=i(12);t.exports={range:o.range,random:o.random,ifElse:o.ifElse,function:o.function,toInt:u.toInt,excerpt:u.excerpt,capitalize:u.capitalize,toJSON:u.toJSON,json:u.json,dos2unix:u.dos2unix,split:u.split,toUpperCase:u.toUpperCase,toLowerCase:u.toLowerCase,trim:u.trim,replace:u.replace,pad:u.pad,duplicate:f.duplicate,sum:f.sum,min:f.min,max:f.max,divide:f.divide,mult:f.mult,ceil:f.ceil,round:f.round,floor:f.floor,trunc:f.trunc,toString:h.toString,size:h.size,contains:h.contains,reverse:h.reverse,repeatify:h.repeatify,concat:h.concat,return:h.return,isFunction:e.isFunction,isArray:e.isArray,isObject:e.isObject,isNumber:e.isNumber,isString:e.isString,isBoolean:e.isBoolean,isInteger:e.isInteger,isEmpty:e.isEmpty,empty:e.isEmpty,isNull:e.isNull,isNaN:e.isNaN,isUndefined:e.isUndefined,e:function(t,n){return e.isEmpty(s.get(t,n))},shuffle:a.shuffle,first:a.first,last:a.last,remove:a.remove,clear:a.clear,inArray:a.inArray,unq:a.uniq,uniq:a.uniq,uniqBy:a.uniqBy,filter:a.filter,filterBy:a.filterBy,map:a.map,reduce:a.reduce,sort:a.sort,forEach:a.forEach,extend:s.extend,assign:s.assign,clone:s.assign,get:s.get,keys:s.keys,getKeys:s.getKeys,merge:s.merge,isTrue:c.isTrue,isFalse:c.isFalse,isEqual:c.isEqual,eq:c.isEqual,Not:c.Not,on:l.on,emit:l.emit,delete:l.delete,each:r.each,waterfall:r.waterfall,wf:r.waterfall,forever:r.forever,fe:r.forever,parallel:r.parallel,par:r.parallel,parallelLimit:r.parallelLimit,pl:r.parallelLimit,epl:r.epl,eachpl:r.eachpl,eachParallelLimit:r.eachParallelLimit,for:r.forSync,forSync:r.forSync,times:r.times,chain:function(t){return new d(t)},c:function(t){return new d(t)}}},function(t,n){function i(){throw new Error("setTimeout has not been defined")}function r(){throw new Error("clearTimeout has not been defined")}function e(t){if(c===setTimeout)return setTimeout(t,0);if((c===i||!c)&&setTimeout)return c=setTimeout,setTimeout(t,0);try{return c(t,0)}catch(n){try{return c.call(null,t,0)}catch(n){return c.call(this,t,0)}}}function o(t){if(h===clearTimeout)return clearTimeout(t);if((h===r||!h)&&clearTimeout)return h=clearTimeout,clearTimeout(t);try{return h(t)}catch(n){try{return h.call(null,t)}catch(n){return h.call(this,t)}}}function a(){y&&d&&(y=!1,d.length?p=d.concat(p):m=-1,p.length&&s())}function s(){if(!y){var t=e(a);y=!0;for(var n=p.length;n;){for(d=p,p=[];++m<n;)d&&d[m].run();m=-1,n=p.length}d=null,y=!1,o(t)}}function u(t,n){this.fun=t,this.array=n}function f(){}var c,h,l=t.exports={};!function(){try{c="function"==typeof setTimeout?setTimeout:i}catch(t){c=i}try{h="function"==typeof clearTimeout?clearTimeout:r}catch(t){h=r}}();var d,p=[],y=!1,m=-1;l.nextTick=function(t){var n=new Array(arguments.length-1);if(arguments.length>1)for(var i=1;i<arguments.length;i++)n[i-1]=arguments[i];p.push(new u(t,n)),1!==p.length||y||e(s)},u.prototype.run=function(){this.fun.apply(null,this.array)},l.title="browser",l.browser=!0,l.env={},l.argv=[],l.version="",l.versions={},l.on=f,l.addListener=f,l.once=f,l.off=f,l.removeListener=f,l.removeAllListeners=f,l.emit=f,l.prependListener=f,l.prependOnceListener=f,l.listeners=function(t){return[]},l.binding=function(t){throw new Error("process.binding is not supported")},l.cwd=function(){return"/"},l.chdir=function(t){throw new Error("process.chdir is not supported")},l.umask=function(){return 0}},function(t,n,i){var r=i(2),e=i(3),o=i(0),a=i(4),s=i(1),u=i(5),f=i(6),c=i(7),h=i(9),l=i(8);t.exports=function(t){if(o.isEmpty(t))throw new Error("Chain function not contains values.");return this.data=t,this.ifElse=function(t,n){return this.data=e.ifElse(this.data,t,n),this},this.function=function(t){return this.data=e.function(this.data,t),this},this.toInt=function(){return this.data=u.toInt(this.data),this},this.excerpt=function(){return this.data=u.excerpt(this.data),this},this.dos2unix=function(){return this.data=u.dos2unix(this.data),this},this.capitalize=function(){return this.data=u.capitalize(this.data),this},this.toJSON=function(){return this.data=u.toJSON(this.data),this},this.json=function(){return this.data=u.json(this.data),this},this.split=function(t,n){return this.data=u.split(this.data,t,n),this},this.toLowerCase=function(){return this.data=u.toLowerCase(this.data),this},this.toUpperCase=function(){return this.data=u.toUpperCase(this.data),this},this.trim=function(){return this.data=u.trim(this.data),this},this.replace=function(t,n){return this.data=u.replace(this.data,t,n),this},this.pad=function(t,n){return this.data=u.pad(this.data,t,n),this},this.duplicate=function(){return this.data=f.duplicate(this.data),this},this.min=function(){return this.data=f.min(this.data),this},this.max=function(){return this.data=f.max(this.data),this},this.sum=function(t){return this.data=f.sum(this.data,t),this},this.mult=function(t){return this.data=f.mult(this.data,t),this},this.divide=function(t){return this.data=f.divide(this.data,t),this},this.numerator=function(t){return this.data=f.divide(t,this.data),this},this.ceil=function(){return this.data=f.ceil(this.data),this},this.round=function(){return this.data=f.round(this.data),this},this.floor=function(){return this.data=f.floor(this.data),this},this.trunc=function(){return this.data=f.trunc(this.data),this},this.toString=function(){return this.data=l.toString(this.data),this},this.size=function(){return this.data=l.size(this.data),this},this.contains=function(t){return this.data=l.contains(this.data,t),this},this.reverse=function(){return this.data=l.reverse(this.data),this},this.repeatify=function(t){return this.data=l.repeatify(this.data,t),this},this.concat=function(t){return this.data=l.concat(this.data,t),this},this.isFunction=function(){return this.data=o.isFunction(this.data),this},this.isArray=function(){return this.data=o.isArray(this.data),this},this.isObject=function(){return this.data=o.isObject(this.data),this},this.isNumber=function(){return this.data=o.isNumber(this.data),this},this.isString=function(){return this.data=o.isString(this.data),this},this.isBoolean=function(){return this.data=o.isBoolean(this.data),this},this.isInteger=function(){return this.data=o.isInteger(this.data),this},this.isEmpty=function(){return this.data=o.isEmpty(this.data),this},this.empty=function(){return this.data=o.isEmpty(this.data),this},this.isNull=function(){return this.data=o.isNull(this.data),this},this.isNaN=function(){return this.data=o.isNaN(this.data),this},this.isUndefined=function(){return this.data=o.isUndefined(this.data),this},this.shuffle=function(){return this.data=a.shuffle(this.data),this},this.first=function(){return this.data=a.first(this.data),this},this.last=function(){return this.data=a.last(this.data),this},this.remove=function(t){return this.data=a.remove(this.data,t),this},this.clear=function(){return this.data=a.clear(this.data),this},this.inArray=function(t){return this.data=a.inArray(this.data,t),this},this.unq=this.uniq=function(){return this.data=a.uniq(this.data),this},this.uniqBy=function(t){return this.data=a.uniq(this.data,t),this},this.filter=function(t){return this.data=a.filter(this.data,t),this},this.filterBy=function(t){return this.data=a.filterBy(this.data,t),this},this.map=function(t){return this.data=a.map(this.data,t),this},this.reduce=function(t){return this.data=a.reduce(this.data,t),this},this.sort=function(t){return this.data=a.sort(this.data,t),this},this.forEach=function(t){a.forEach(this.data,t)},this.extend=function(t){return this.data=s.extend(this.data,t),this},this.get=function(t){return this.data=s.get(this.data,t),this},this.keys=function(){return this.data=s.keys(this.data),this},this.getKeys=function(){return this.data=s.getKeys(this.data),this},this.merge=function(t){return this.data=s.merge(this.data,t),this},this.isTrue=function(){return this.data=c.isTrue(this.data),this},this.isFalse=function(){return this.data=c.isFalse(this.data),this},this.isEqual=function(t){return this.data=c.isEqual(this.data,t),this},this.eq=function(t){return this.data=c.isEqual(this.data,t),this},this.Not=function(){return this.data=c.not(this.data),this},this.not=function(){return this.data=c.not(this.data),this},this.on=function(t,n){return h.on(t,n),this},this.emit=function(t){return h.emit(t,this.data),this},this.delete=function(t){return h.delete(t),this},this.each=function(t,n){r.each(this.data,t,n)},this.epl=function(t,n,i){r.epl(this.data,t,n,i)},this.and=function(t){return!!this.data&&(this.data=t,this)},this.value=this.v=this.return=this.r=function(){return this.data},this.noReturn=this.end=function(){return null},this}}])});
\ No newline at end of file
+!function(t,n){"object"==typeof exports&&"object"==typeof module?module.exports=n():"function"==typeof define&&define.amd?define([],n):"object"==typeof exports?exports.sb=n():t.sb=n()}(this,function(){return function(t){function n(e){if(r[e])return r[e].exports;var i=r[e]={i:e,l:!1,exports:{}};return t[e].call(i.exports,i,i.exports,n),i.l=!0,i.exports}var r={};return n.m=t,n.c=r,n.d=function(t,r,e){n.o(t,r)||Object.defineProperty(t,r,{configurable:!1,enumerable:!0,get:e})},n.n=function(t){var r=t&&t.__esModule?function(){return t.default}:function(){return t};return n.d(r,"a",r),r},n.o=function(t,n){return Object.prototype.hasOwnProperty.call(t,n)},n.p="",n(n.s=11)}([function(t,n,r){"use strict";var e="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(t){return typeof t}:function(t){return t&&"function"==typeof Symbol&&t.constructor===Symbol&&t!==Symbol.prototype?"symbol":typeof t},i={isFunction:function(t){return"function"==typeof t},isArray:function(t){return"object"===(void 0===t?"undefined":e(t))&&t instanceof Array},isObject:function(t){return"object"===(void 0===t?"undefined":e(t))&&!(t instanceof Array)&&null!==t},isNumber:function(t){return"number"==typeof t||t instanceof Number},isInteger:function(t){return!!i.isNumber(t)&&t%1==0},isString:function(t){return"string"==typeof t||t instanceof String},isBoolean:function(t){return"boolean"==typeof t},isEmpty:function(t){return i.isUndefined(t)||i.isNull(t)||""===t},isNull:function(t){return null===t},isNaN:function(t){function n(n){return t.apply(this,arguments)}return n.toString=function(){return t.toString()},n}(function(t){return isNaN(t)}),isUndefined:function(t){return void 0===t}};t.exports=i},function(t,n,r){"use strict";var e=r(0);t.exports={extend:function(t,n){for(var r in n)n.hasOwnProperty(r)&&(t[r]=n[r]);return t},assign:function(t){if(e.isNull(t)||!e.isObject(t)||"isActiveClone"in t)return t;var n=t.constructor();for(var r in t)Object.prototype.hasOwnProperty.call(t,r)&&(t.isActiveClone=null,n[r]=t[r],delete t.isActiveClone);return n},get:function(t,n){if(!e.isEmpty(t)&&e.isString(n)){if(n=n.split("."),1===n.length)return t[n[0]];for(var r=0;r<n.length;r++){if(e.isEmpty(t[n[r]]))return;t=t[n[r]]}return t}},keys:function(t){return Object.keys(t)},getKeys:function(t,n){var r={};return e.isArray(n)?n.forEach(function(n){r[n]=t[n]}):r[n]=t[n],r},merge:function(t,n){var r={};if(e.isObject(t)&&e.isObject(n))return Object.keys(t).forEach(function(n){r[n]=t[n]}),Object.keys(n).forEach(function(t){r[t]=n[t]}),r;throw new Error("Merge option need two objects for work")}}},function(t,n,r){"use strict";(function(n){var r="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(t){return typeof t}:function(t){return t&&"function"==typeof Symbol&&t.constructor===Symbol&&t!==Symbol.prototype?"symbol":typeof t},e={each:function(t,n,r){var e=0,i=[],o=function(t){"function"==typeof r&&r(t)};e<t.length?function a(u){if(void 0!==u&&null!==u&&(i[e-1]=u),e<t.length){var s=e;e++,n(t[s],s,a,o)}else"function"==typeof r&&r(i)}():"function"==typeof r&&r(i)},waterfall:function(t,n){var r=0,e=function e(i,o){r<t.length-1?(r++,null!==i&&void 0!==i?!0===i?"function"==typeof n&&n(o):t[r](e,i):t[r](e)):"function"==typeof n&&(null!==i&&void 0!==i?n(!0===i?o:i):n())};t instanceof Array&&t[r](e)},forever:function(t,n){var r=function(t){"function"==typeof n&&n(t)};t(function n(){t(n,r)},r)},parallelLimit:function(t,n,r){var e=0,i=n.length,o=[];if(n instanceof Array)for(var a=0;a<t;a++)!function t(a){var u=function(u){i--,null!==u&&void 0!==u&&(o[a]=u),e!==n.length?(t(e),e++):0===i&&"function"==typeof r&&r(o)};n[a](u)}(a),e++},forSync:function(t,n,r,e,i){var o=[],a=function a(u){null!==u&&void 0!==u&&o.push(u),t<n?(t+=r,e(t,a,i)):"function"==typeof i&&i(o)};e(t,a,i)},eachParallelLimit:function(t,n,r,e){var i=0,o=t.length,a=[];if(t instanceof Array&&t.length>0){n>t.length&&(n=t.length);for(var u=0;u<n;u++)!function n(u,s){r(u,s,function(r){o--,null!==r&&void 0!==r&&(a[s]=r),i!==t.length?(n(t[i],i),i++):0===o&&"function"==typeof e&&e(a)},function(t){"function"==typeof e&&e(t)})}(t[u],u),i++}else"function"==typeof e&&e(a)},times:function(t,n,r){e.forSync(0,t-1,1,n,r)},parallel:function(t,n){var r=0,e=[];if(t instanceof Array)for(var i=0;i<t.length;i++)!function(i){var o=function(o){null!==o&&void 0!==o&&(e[i]=o),r<t.length-1?r++:"function"==typeof n&&n(e)};t[i](o)}(i)}};e.eachpl=e.eachParallelLimit,e.epl=e.eachParallelLimit,e.wf=e.waterfall,e.pl=e.parallelLimit,e.fe=e.forever,e.for=e.forSync,"object"===(void 0===n?"undefined":r(n))&&(t.exports=e)}).call(n,r(3))},function(t,n,r){"use strict";function e(){throw new Error("setTimeout has not been defined")}function i(){throw new Error("clearTimeout has not been defined")}function o(t){if(l===setTimeout)return setTimeout(t,0);if((l===e||!l)&&setTimeout)return l=setTimeout,setTimeout(t,0);try{return l(t,0)}catch(n){try{return l.call(null,t,0)}catch(n){return l.call(this,t,0)}}}function a(t){if(h===clearTimeout)return clearTimeout(t);if((h===i||!h)&&clearTimeout)return h=clearTimeout,clearTimeout(t);try{return h(t)}catch(n){try{return h.call(null,t)}catch(n){return h.call(this,t)}}}function u(){v&&d&&(v=!1,d.length?p=d.concat(p):m=-1,p.length&&s())}function s(){if(!v){var t=o(u);v=!0;for(var n=p.length;n;){for(d=p,p=[];++m<n;)d&&d[m].run();m=-1,n=p.length}d=null,v=!1,a(t)}}function f(t,n){this.fun=t,this.array=n}function c(){}var l,h,y=t.exports={};!function(){try{l="function"==typeof setTimeout?setTimeout:e}catch(t){l=e}try{h="function"==typeof clearTimeout?clearTimeout:i}catch(t){h=i}}();var d,p=[],v=!1,m=-1;y.nextTick=function(t){var n=new Array(arguments.length-1);if(arguments.length>1)for(var r=1;r<arguments.length;r++)n[r-1]=arguments[r];p.push(new f(t,n)),1!==p.length||v||o(s)},f.prototype.run=function(){this.fun.apply(null,this.array)},y.title="browser",y.browser=!0,y.env={},y.argv=[],y.version="",y.versions={},y.on=c,y.addListener=c,y.once=c,y.off=c,y.removeListener=c,y.removeAllListeners=c,y.emit=c,y.prependListener=c,y.prependOnceListener=c,y.listeners=function(t){return[]},y.binding=function(t){throw new Error("process.binding is not supported")},y.cwd=function(){return"/"},y.chdir=function(t){throw new Error("process.chdir is not supported")},y.umask=function(){return 0}},function(t,n,r){"use strict";(function(n){var e="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(t){return typeof t}:function(t){return t&&"function"==typeof Symbol&&t.constructor===Symbol&&t!==Symbol.prototype?"symbol":typeof t},i=r(0),o={event_stack:{},on:function(t,n){if(i.isEmpty((void 0).event_stack)&&((void 0).event_stack={}),i.isEmpty(t))throw new Error("Need event key!");if(!i.isFunction(n))throw new Error("Event needs a function!");if(i.isArray(t))for(var r=0;r<t.length;r++)(void 0).event_stack[t[r]]=n;else(void 0).event_stack[t]=n},emit:function(t,n){if(i.isEmpty(t))throw new Error("No event selected.");if(i.isArray(t))for(var r=0;r<t.length;r++)i.isFunction((void 0).event_stack[t[r]])&&(void 0).event_stack[t[r]](n);else i.isFunction((void 0).event_stack[t])&&(void 0).event_stack[t](n)},delete:function(t){i.isEmpty((void 0).event_stack[t])||delete(void 0).event_stack[t]}};"object"===(void 0===n?"undefined":e(n))&&(t.exports=o)}).call(n,r(3))},function(t,n,r){"use strict";var e="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(t){return typeof t}:function(t){return t&&"function"==typeof Symbol&&t.constructor===Symbol&&t!==Symbol.prototype?"symbol":typeof t},i=r(0);t.exports={range:function(t,n,r){var o=[];if(i.isEmpty(t)||i.isEmpty(n))return[];if((void 0===t?"undefined":e(t))!==(void 0===n?"undefined":e(n)))return[];if(i.isNumber(t))for(o[0]=t,r=r||1;t+r<=n;)o[o.length]=t+=r;else{var a="abcdefghijklmnopqrstuvwxyz";t===t.toUpperCase()&&(n=n.toUpperCase(),a=a.toUpperCase()),a=a.substring(a.indexOf(t),a.indexOf(n)+1),o=a.split("")}return o},random:function(t,n){if(i.isNumber(t)&&i.isNumber(n))return Math.floor(Math.random()*(n-t))+t;if(i.isArray(t)){return t[Math.floor(Math.random()*t.length)]}return 0},ifElse:function(t,n,r){return t?n():r()},function:function(t,n){return n(t)}}},function(t,n,r){"use strict";var e="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(t){return typeof t}:function(t){return t&&"function"==typeof Symbol&&t.constructor===Symbol&&t!==Symbol.prototype?"symbol":typeof t},i=r(0),o=r(1);t.exports={shuffle:function(t){if(i.isArray(t)){return Object.assign([],t).sort(function(t,n){return.5-Math.random()})}throw new Error("Shuffle function not contains array.")},first:function(t){if(i.isArray(t))return t[0];throw new Error("first function not contains array.")},last:function(t){if(i.isArray(t))return t[t.length-1];throw new Error("Last function not contains array.")},remove:function(t,n){var r=o.assign(t),e=function(t,n){return t.filter(function(t){if(JSON.stringify(t)!==JSON.stringify(n))return t})};return i.isArray(n)?(n.forEach(function(t){r=e(r,t)}),r):e(r,n)},clear:function(t){var n=o.assign(t);if(i.isArray(n))return n.splice(n.length,0);throw new Error("clear function not contains array.")},inArray:function(t,n){if(i.isArray(t))return!!~t.indexOf(n);throw new Error("inArray function not contains array.")},uniqBy:function(t,n){if(i.isArray(t)){for(var r=[],e={},o=0;o<t.length;o++)void 0===e[t[o][n]]&&void 0!==t[o][n]&&(r.push(t[o][n]),e[t[o][n]]=1);return r}throw new Error("uniq function not contains array.")},uniq:function(t){for(var n=[],r=0;r<t.length;r++)(function(t,n){for(var r=0;r<t.length;r++)if(JSON.stringify(t[r])===JSON.stringify(n))return!0;return!1})(n,t[r])||n.push(t[r]);return n},filter:function(t,n){if(i.isEmpty(t))throw new Error("filter function not contains array.");if(i.isEmpty(n)||!i.isFunction(n))throw new Error("Find in array need a function.");return t.filter(n)},filterBy:function(t,n){if(i.isEmpty(t))throw new Error("filter function not contains array.");if(i.isEmpty(n)&&"object"!==(void 0===n?"undefined":e(n)))throw new Error("Find in array need a object.");var r=Object.keys(n);return t.filter(function(t){var e=!0;return r.forEach(function(r){"string"==typeof t[r]?t[r].indexOf(n[r])<0&&(e=!1):t[r]!==n[r]&&(e=!1)}),e})},map:function(t,n){if(i.isArray(t)){if(i.isFunction(n))return t.map(n);throw new Error("map function not contains callback function.")}throw new Error("map function not contains array.")},reduce:function(t,n){if(i.isArray(t)){if(i.isFunction(n))return t.reduce(n);throw new Error("map function not contains callback function.")}throw new Error("reduce function not contains array.")},forEach:function(t,n){if(!i.isArray(t))throw new Error("forEach function not contains array.");if(!i.isFunction(n))throw new Error("forEach function not contains callback function.");t.forEach(n)},sort:function(t,n){if(i.isArray(t))return i.isFunction(n)?t.sort(n):t.sort();throw new Error("sort function not contains array.")}}},function(t,n,r){"use strict";var e=r(0);t.exports={toInt:function(t){if(e.isEmpty(t))throw new Error("To int needs an string value.");if(e.isString(t))return parseInt(t,10);throw new Error("toInt function has incompatible value.")},dos2unix:function(t){if(e.isEmpty(t))throw new Error("Dos2unix function needs an string value.");if(e.isString(t))return t.replace(/\r\n/g,"\n");throw new Error("Dos2unix function has incompatible value.")},capitalize:function(t){if(e.isEmpty(t))throw new Error("Capitalize function needs an string value.");if(e.isString(t))return t.slice(0,1).toUpperCase()+t.slice(1);throw new Error("Capitalize function has incompatible value.")},excerpt:function(t,n){var r=t.split(" ");return r.splice(n,r.length-1),r.join(" ")},toJSON:function(t){if(e.isEmpty(t))throw new Error("toJSON function needs an string value.");if(e.isString(t))return JSON.parse(t);throw new Error("toJSON function has incompatible value.")},json:function(t){if(e.isEmpty(t))throw new Error("toJSON function needs an string value.");if(e.isString(t))return JSON.parse(t);throw new Error("toJSON function has incompatible value.")},split:function(t,n,r){if(e.isEmpty(t))throw new Error("Split function needs an string value.");if(e.isString(t))return t.split(n,r);throw new Error("Split function has incompatible value.")},toLowerCase:function(t){if(e.isEmpty(t))throw new Error("toLowerCase function needs an string value.");if(e.isString(t))return t.toLowerCase();throw new Error("toLowerCase function has incompatible value.")},toUpperCase:function(t){if(e.isEmpty(t))throw new Error("toUpperCase function needs an string value.");if(e.isString(t))return t.toUpperCase();throw new Error("toUpperCase function has incompatible value.")},trim:function(t){if(e.isEmpty(t))throw new Error("trim function needs an string value.");if(e.isString(t))return t.trim();throw new Error("trim function has incompatible value.")},replace:function(t,n,r){if(e.isEmpty(t)&&e.isEmpty(r))throw new Error("replace function needs an string value.");if(e.isString(t)&&e.isString(r))return t.replace(n,r);throw new Error("replace function has incompatible value.")},pad:function(t,n,r){return n>>=0,r=String(r||" "),t.length>n?String(t):(n-=t.length,n>r.length&&(r+=r.repeat(n/r.length)),r.slice(0,n)+String(t))}}},function(t,n,r){"use strict";var e=r(0);t.exports={duplicate:function(t){if(e.isNumber(t))return 2*t;throw new Error("Duplicate function needs a number.")},min:function(t){if(e.isArray(t)){var n=!0;if(t.forEach(function(t){n&&!e.isNumber(t)&&(n=!1)}),n)return Math.min.apply(Math,t);throw new Error("Min funciton needs an array of numbers.")}throw new Error("Min funciton needs an array.")},max:function(t){if(e.isArray(t)){var n=!0;if(t.forEach(function(t){n&&!e.isNumber(t)&&(n=!1)}),n)return Math.max.apply(Math,t);throw new Error("Min funciton needs an array of numbers.")}throw new Error("Min funciton needs an array.")},sum:function(t,n){if(e.isNumber(t)&&e.isNumber(n))return t+n;throw new Error("Sum function only can operate with numbers.")},divide:function(t,n){if(e.isNumber(t)&&e.isNumber(n))return t/n;throw new Error("Divide function only can operate with numbers.")},mult:function(t,n){if(e.isNumber(t)&&e.isNumber(n))return n*t;throw new Error("Mult function only can operate with numbers.")},ceil:function(t){if(e.isNumber(t))return Math.ceil(t);throw new Error("ceil function only can operate with numbers.")},round:function(t){if(e.isNumber(t))return Math.round(t);throw new Error("round function only can operate with numbers.")},floor:function(t){if(e.isNumber(t))return Math.floor(t);throw new Error("floor function only can operate with numbers.")},trunc:function(t){if(e.isNumber(t))return Math.trunc(t);throw new Error("floor function only can operate with numbers.")}}},function(t,n,r){"use strict";t.exports={isTrue:function(t){return!0===t},isFalse:function(t){return!1===t},isEqual:function(t,n){return JSON.stringify(t)===JSON.stringify(n)},not:function(t){return!1===t},and:function(t,n){return!(!t||!n)}}},function(t,n,r){"use strict";var e=r(0);t.exports={toString:function(t){if(e.isEmpty(t))throw new Error("toString function not contains value to parse.");return JSON.stringify(t)},size:function(t){if(e.isEmpty(t))throw new Error("size function not contains values.");if(e.isArray(t)||e.isString(t))return t.length;if(e.isObject(t))return Object.keys(t).length;throw new Error("size function not contains compatible values.")},contains:function(t,n){if(e.isArray(t)||e.isString(t))return!!~t.indexOf(n);if(e.isObject(t))return!!~Object.keys(t).indexOf(n);throw new Error("contains function not contains values.")},reverse:function(t){if(e.isArray(t))return t.reverse();if(e.isString(t))return t.split("").reverse().join("");throw new Error("Reverse function not contains array or string.")},repeatify:function(t,n){if(e.isEmpty(t))throw new Error("repeatify function not have data for repeat.");if(e.isEmpty(n)||!e.isNumber(n))throw new Error("repeatify function not have a number for repeat.");for(var r=[],i=0;i<n;i++)r.push(t);return r},concat:function(t,n){if(e.isEmpty(t)||e.isEmpty(n))throw new Error("concat function not have values.");if(e.isString(t)&&e.isString(t))return t+n;if(e.isArray(t)&&e.isArray(t))return t.concat(n);throw new Error("concat function not contains same values.")},return:function(t){return t}}},function(t,n,r){"use strict";var e=r(2),i=r(0),o=r(4),a=r(5),u=r(6),s=r(1),f=r(7),c=r(8),l=r(9),h=r(10),y=r(12);t.exports={range:a.range,random:a.random,ifElse:a.ifElse,function:a.function,toInt:f.toInt,excerpt:f.excerpt,capitalize:f.capitalize,toJSON:f.toJSON,json:f.json,dos2unix:f.dos2unix,split:f.split,toUpperCase:f.toUpperCase,toLowerCase:f.toLowerCase,trim:f.trim,replace:f.replace,pad:f.pad,duplicate:c.duplicate,sum:c.sum,min:c.min,max:c.max,divide:c.divide,mult:c.mult,ceil:c.ceil,round:c.round,floor:c.floor,trunc:c.trunc,toString:h.toString,size:h.size,contains:h.contains,reverse:h.reverse,repeatify:h.repeatify,concat:h.concat,return:h.return,isFunction:i.isFunction,isArray:i.isArray,isObject:i.isObject,isNumber:i.isNumber,isString:i.isString,isBoolean:i.isBoolean,isInteger:i.isInteger,isEmpty:i.isEmpty,empty:i.isEmpty,isNull:i.isNull,isNaN:i.isNaN,isUndefined:i.isUndefined,e:function(t,n){return i.isEmpty(s.get(t,n))},shuffle:u.shuffle,first:u.first,last:u.last,remove:u.remove,clear:u.clear,inArray:u.inArray,unq:u.uniq,uniq:u.uniq,uniqBy:u.uniqBy,filter:u.filter,filterBy:u.filterBy,map:u.map,reduce:u.reduce,sort:u.sort,forEach:u.forEach,extend:s.extend,assign:s.assign,clone:s.assign,get:s.get,keys:s.keys,getKeys:s.getKeys,merge:s.merge,isTrue:l.isTrue,isFalse:l.isFalse,isEqual:l.isEqual,eq:l.isEqual,Not:l.Not,on:o.on,emit:o.emit,delete:o.delete,each:e.each,waterfall:e.waterfall,wf:e.waterfall,forever:e.forever,fe:e.forever,parallel:e.parallel,par:e.parallel,parallelLimit:e.parallelLimit,pl:e.parallelLimit,epl:e.epl,eachpl:e.eachpl,eachParallelLimit:e.eachParallelLimit,for:e.forSync,forSync:e.forSync,times:e.times,chain:function(t){return new y(t)},c:function(t){return new y(t)}}},function(t,n,r){"use strict";function e(t,n){if(!(t instanceof n))throw new TypeError("Cannot call a class as a function")}var i=function(){function t(t,n){for(var r=0;r<n.length;r++){var e=n[r];e.enumerable=e.enumerable||!1,e.configurable=!0,"value"in e&&(e.writable=!0),Object.defineProperty(t,e.key,e)}}return function(n,r,e){return r&&t(n.prototype,r),e&&t(n,e),n}}(),o=r(2),a=r(0),u=r(4),s=r(5),f=r(6),c=r(1),l=r(7),h=r(8),y=r(9),d=r(10);t.exports=function(){function t(n){if(e(this,t),a.isEmpty(n))throw new Error("Chain function not contains values.");this.data=n}return i(t,[{key:"ifElse",value:function(t,n){return this.data=s.ifElse(this.data,t,n),this}},{key:"function",value:function(t){return this.data=s.function(this.data,t),this}},{key:"toInt",value:function(){return this.data=l.toInt(this.data),this}},{key:"excerpt",value:function(){return this.data=l.excerpt(this.data),this}},{key:"dos2unix",value:function(){return this.data=l.dos2unix(this.data),this}},{key:"capitalize",value:function(){return this.data=l.capitalize(this.data),this}},{key:"toJSON",value:function(){return this.data=l.toJSON(this.data),this}},{key:"json",value:function(){return this.data=l.json(this.data),this}},{key:"split",value:function(t,n){return this.data=l.split(this.data,t,n),this}},{key:"toLowerCase",value:function(){return this.data=l.toLowerCase(this.data),this}},{key:"toUpperCase",value:function(){return this.data=l.toUpperCase(this.data),this}},{key:"trim",value:function(){return this.data=l.trim(this.data),this}},{key:"replace",value:function(t,n){return data=l.replace(this.data,t,n),this}},{key:"pad",value:function(t,n){return data=l.pad(this.data,t,n),this}},{key:"duplicate",value:function(){return this.data=h.duplicate(this.data),this}},{key:"min",value:function(){return this.data=h.min(this.data),this}},{key:"max",value:function(){return this.data=h.max(this.data),this}},{key:"sum",value:function(t){return this.data=h.sum(this.data,t),this}},{key:"mult",value:function(t){return this.data=h.mult(this.data,t),this}},{key:"divide",value:function(t){return this.data=h.divide(this.data,t),this}},{key:"numerator",value:function(t){return this.data=h.divide(t,this.data),this}},{key:"ceil",value:function(){return this.data=h.ceil(this.data),this}},{key:"round",value:function(){return this.data=h.round(this.data),this}},{key:"floor",value:function(){return this.data=h.floor(this.data),this}},{key:"trunc",value:function(){return this.data=h.trunc(this.data),this}},{key:"toString",value:function(){return this.data=d.toString(this.data),this}},{key:"size",value:function(){return this.data=d.size(this.data),this}},{key:"contains",value:function(t){return this.data=d.contains(this.data,t),this}},{key:"reverse",value:function(){return this.data=d.reverse(this.data),this}},{key:"repeatify",value:function(t){return this.data=d.repeatify(this.data,t),this}},{key:"concat",value:function(t){return this.data=d.concat(this.data,t),this}},{key:"isFunction",value:function(){return this.data=a.isFunction(this.data),this}},{key:"isArray",value:function(){return this.data=a.isArray(this.data),this}},{key:"isObject",value:function(){return this.data=a.isObject(this.data),this}},{key:"isNumber",value:function(){return this.data=a.isNumber(this.data),this}},{key:"isString",value:function(){return this.data=a.isString(this.data),this}},{key:"isBoolean",value:function(){return this.data=a.isBoolean(this.data),this}},{key:"isInteger",value:function(){return this.data=a.isInteger(this.data),this}},{key:"isEmpty",value:function(){return this.data=a.isEmpty(this.data),this}},{key:"empty",value:function(){return this.data=a.isEmpty(this.data),this}},{key:"isNull",value:function(){return this.data=a.isNull(this.data),this}},{key:"isNaN",value:function(){return this.data=a.isNaN(this.data),this}},{key:"isUndefined",value:function(){return this.data=a.isUndefined(this.data),this}},{key:"shuffle",value:function(){return this.data=f.shuffle(this.data),this}},{key:"first",value:function(){return this.data=f.first(this.data),this}},{key:"last",value:function(){return this.data=f.last(this.data),this}},{key:"remove",value:function(t){return this.data=f.remove(this.data,t),this}},{key:"clear",value:function(){return this.data=f.clear(this.data),this}},{key:"inArray",value:function(t){return this.data=f.inArray(this.data,t),this}},{key:"unq",value:function(){return this.data=f.uniq(this.data),this}},{key:"uniq",value:function(){return this.data=f.uniq(this.data),this}},{key:"uniqBy",value:function(t){return this.data=f.uniq(this.data,t),this}},{key:"filter",value:function(t){return this.data=f.filter(this.data,t),this}},{key:"filterBy",value:function(t){return this.data=f.filterBy(this.data,t),this}},{key:"map",value:function(t){return this.data=f.map(this.data,t),this}},{key:"reduce",value:function(t){return this.data=f.reduce(this.data,t),this}},{key:"sort",value:function(t){return this.data=f.sort(this.data,t),this}},{key:"forEach",value:function(t){f.forEach(this.data,t)}},{key:"extend",value:function(t){return this.data=c.extend(this.data,t),this}},{key:"get",value:function(t){return this.data=c.get(this.data,t),this}},{key:"keys",value:function(){return this.data=c.keys(this.data),this}},{key:"getKeys",value:function(){return this.data=c.getKeys(this.data),this}},{key:"merge",value:function(t){return this.data=c.merge(this.data,t),this}},{key:"isTrue",value:function(){return this.data=y.isTrue(this.data),this}},{key:"isFalse",value:function(){return this.data=y.isFalse(this.data),this}},{key:"isEqual",value:function(t){return this.data=y.isEqual(this.data,t),this}},{key:"eq",value:function(t){return this.data=y.isEqual(this.data,t),this}},{key:"Not",value:function(){return this.data=y.not(this.data),this}},{key:"not",value:function(){return this.data=y.not(this.data),this}},{key:"on",value:function(t,n){return u.on(t,n),this}},{key:"emit",value:function(t){return u.emit(t,this.data),this}},{key:"delete",value:function(t){return u.delete(t),this}},{key:"each",value:function(t,n){o.each(this.data,t,n)}},{key:"epl",value:function(t,n,r){o.epl(this.data,t,n,r)}},{key:"and",value:function(t){return!!this.data&&(this.data=t,this)}},{key:"r",value:function(){return this.data}},{key:"return",value:function(){return this.data}},{key:"v",value:function(){return this.data}},{key:"value",value:function(){return this.data}},{key:"end",value:function(){return null}},{key:"noReturn",value:function(){return null}}]),t}()}])});
\ No newline at end of file
diff --git a/src/array.js b/src/array.js
index a66aa38..b39ab8b 100644
--- a/src/array.js
+++ b/src/array.js
@@ -1,5 +1,5 @@
-var type = require('tck');
-var object = require('./object');
+const type = require('tck')
+const object = require('./object')
 
 module.exports = {
 
@@ -7,35 +7,31 @@ module.exports = {
    * @param {Array} array : Array to process.
    * @returns {Array} : Return shuffled array
    */
-  'shuffle': function (array) {
+  shuffle: array => {
     if (type.isArray(array)) {
-      var arrnew = object.assign(array);
-      for (var i = arrnew.length-1; i >=0; i--) {
-        var randomIndex = Math.floor(Math.random()*(i+1));
-        var itemAtIndex = arrnew[randomIndex];
-        arrnew[randomIndex] = arrnew[i];
-        arrnew[i] = itemAtIndex;
-      }
-      return arrnew;
-    } else throw new Error('Shuffle function not contains array.');
+      var newarray = Object.assign([], array)
+      return newarray.sort((a, b) => {
+        return 0.5 - Math.random()
+      })
+    } else throw new Error('Shuffle function not contains array.')
   },
 
   /**
    * @param {Array} array  : Array to process.
    * @returns {Any} : Return first array element.
    */
-  'first': function (array) {
-    if (type.isArray(array)) return array[0];
-    else throw new Error('first function not contains array.');
+  first: array => {
+    if (type.isArray(array)) return array[0]
+    else throw new Error('first function not contains array.')
   },
 
   /**
    * @param {Array} array : Array to process.
    * @returns {Array} : Return last array element.
    */
-  'last': function (array) {
-    if (type.isArray(array)) return array[array.length - 1];
-    else throw new Error('Last function not contains array.');
+  last: array => {
+    if (type.isArray(array)) return array[array.length - 1]
+    else throw new Error('Last function not contains array.')
   },
 
   /**
@@ -43,19 +39,19 @@ module.exports = {
    * @param {Any} obj : any to remove of array.
    * @returns {Array} : Return array without element.
    */
-  'remove': function (array, obj) {
-    var newarr = object.assign(array);
-    function filter(newarr, obj) {
-      return newarr.filter(function (e) {
-        if (JSON.stringify(e) !== JSON.stringify(obj)) return e;
-      });
+  remove: (array, obj) => {
+    var newarr = object.assign(array)
+    const filter = (newarr, obj) => {
+      return newarr.filter(e => {
+        if (JSON.stringify(e) !== JSON.stringify(obj)) return e
+      })
     }
     if (type.isArray(obj)) {
-      obj.forEach(function (e) {
-        newarr = filter(newarr, e);
-      });
-      return newarr;
-    } else return filter(newarr, obj);
+      obj.forEach(e => {
+        newarr = filter(newarr, e)
+      })
+      return newarr
+    } else return filter(newarr, obj)
   },
 
 
@@ -63,10 +59,10 @@ module.exports = {
    * @param {Array} array : Array to process.
    * @returns {Array} : Returns a empty array.
    */
-  'clear': function (array) {
-    var newarr = object.assign(array);
-    if (type.isArray(newarr)) return newarr.splice(newarr.length,0);
-    else throw new Error('clear function not contains array.');
+  clear: array => {
+    var newarr = object.assign(array)
+    if (type.isArray(newarr)) return newarr.splice(newarr.length,0)
+    else throw new Error('clear function not contains array.')
   },
 
   /**
@@ -74,9 +70,9 @@ module.exports = {
    * @param {Any} value : Any to find in array.
    * @returns {Boolean} : Returns true or false if contains value.
    */
-  'inArray': function (array, value) {
-    if (type.isArray(array)) return !!~array.indexOf(value);
-    else throw new Error('inArray function not contains array.');
+  inArray: (array, value) => {
+    if (type.isArray(array)) return !!~array.indexOf(value)
+    else throw new Error('inArray function not contains array.')
   },
 
   /**
@@ -84,37 +80,37 @@ module.exports = {
    * @param {String|Number} key  : Key operator for filter data.
    * @returns {Array} : Return procesed array.
    */
-  'uniqBy': function (array, key) {
+  uniqBy: (array, key) => {
     if (type.isArray(array)) {
-      var narray = [];
-      var keys = {};
-      for (var i = 0; i < array.length; i++) {
+      var narray = []
+      var keys = {}
+      for (let i = 0; i < array.length; i++) {
         if(keys[array[i][key]] === undefined && array[i][key] !== undefined) {
-          narray.push(array[i][key]);
-          keys[array[i][key]] = 1;
+          narray.push(array[i][key])
+          keys[array[i][key]] = 1
         }
       }
-      return narray;
-    } else throw new Error('uniq function not contains array.');
+      return narray
+    } else throw new Error('uniq function not contains array.')
   },
 
   /**
    * @param {Array} array  : array to process.
    * @returns {Array} : Return no duplicated values.
    */
-  'uniq': function (array) {
-    var newarr = [];
-    var contains = function(array, value) {
-      for(var i = 0; i < array.length; i++) {
-        if(JSON.stringify(array[i]) === JSON.stringify(value)) return true;
+  uniq: array => {
+    var newarr = []
+    const contains = (array, value) => {
+      for(let i = 0; i < array.length; i++) {
+        if(JSON.stringify(array[i]) === JSON.stringify(value)) return true
       }
-      return false;
-    };
+      return false
+    }
 
-    for(var i = 0; i < array.length; i++) {
-      if(!contains(newarr, array[i])) newarr.push(array[i]);
+    for(let i = 0; i < array.length; i++) {
+      if(!contains(newarr, array[i])) newarr.push(array[i])
     }
-    return newarr;
+    return newarr
   },
 
   /**
@@ -122,10 +118,10 @@ module.exports = {
    * @param {Function} func : function to filter array.
    * @returns {Array} : Return filtered values.
    */
-  'filter': function (array, func) {
-    if (type.isEmpty(array)) throw new Error('filter function not contains array.');
-    else if (type.isEmpty(func) && typeof obj !== 'function') throw new Error('Find in array need a object.');
-    else return array.filter(func);
+  filter: (array, func) => {
+    if (type.isEmpty(array)) throw new Error('filter function not contains array.')
+    else if (type.isEmpty(func) || !type.isFunction(func)) throw new Error('Find in array need a function.')
+    else return array.filter(func)
   },
 
   /**
@@ -133,22 +129,22 @@ module.exports = {
    * @param {Object} obj : object to filter array.
    * @returns {Array} : Return filtered values.
    */
-  'filterBy': function (array, obj) {
-    if (type.isEmpty(array)) throw new Error('filter function not contains array.');
-    else if (type.isEmpty(obj) && typeof obj !== 'object') throw new Error('Find in array need a object.');
+  filterBy: (array, obj) => {
+    if (type.isEmpty(array)) throw new Error('filter function not contains array.')
+    else if (type.isEmpty(obj) && typeof obj !== 'object') throw new Error('Find in array need a object.')
     else {
-      var keys = Object.keys(obj);
-      return array.filter(function (e) {
-        var chck = true;
-        keys.forEach(function (k) {
+      var keys = Object.keys(obj)
+      return array.filter(e => {
+        var chck = true
+        keys.forEach(k => {
           if (typeof e[k] === 'string') {
-            if(e[k].indexOf(obj[k]) < 0) chck = false;
+            if(e[k].indexOf(obj[k]) < 0) chck = false
           } else {
-            if(e[k] !== obj[k]) chck = false;
+            if(e[k] !== obj[k]) chck = false
           }
-        });
-        return chck;
-      });
+        })
+        return chck
+      })
     }
   },
 
@@ -157,12 +153,12 @@ module.exports = {
    * @param {Function} callback : function to map array.
    * @returns {Array} : Return altered array.
    */
-  'map': function (array, callback) {
+  map: (array, callback) => {
     if (type.isArray(array)) {
       if (type.isFunction(callback)) {
-        return array.map(callback);
-      } else throw new Error('map function not contains callback.');
-    } else throw new Error('map function not contains array.');
+        return array.map(callback)
+      } else throw new Error('map function not contains callback function.')
+    } else throw new Error('map function not contains array.')
   },
 
   /**
@@ -170,12 +166,12 @@ module.exports = {
    * @param {Function} callback : function to reduce array.
    * @returns {Array} : Return array from operation result.
    */
-  'reduce': function (array, callback) {
+  reduce: (array, callback) => {
     if (type.isArray(array)) {
       if (type.isFunction(callback)) {
-        return array.reduce(callback);
-      } else return array.sort(array);
-    } else throw new Error('reduce function not contains array.');
+        return array.reduce(callback)
+      } else throw new Error('map function not contains callback function.')
+    } else throw new Error('reduce function not contains array.')
   },
 
   /**
@@ -183,12 +179,11 @@ module.exports = {
    * @param {Function} callback : function to forEach array.
    * @returns {undefined}
    */
-  'forEach': function (array, callback) {
+  forEach: (array, callback) => {
     if (type.isArray(array)) {
-      if (type.isFunction(callback)) {
-        array.forEach(callback);
-      } else return array.sort(array);
-    } else throw new Error('forEach function not contains array.');
+      if (type.isFunction(callback)) array.forEach(callback)
+      else throw new Error('forEach function not contains callback function.')
+    } else throw new Error('forEach function not contains array.')
   },
 
   /**
@@ -196,11 +191,11 @@ module.exports = {
    * @param {Function} callback  : function condition for sort.
    * @returns {Array} : Return array sorted by condition.
    */
-  'sort': function (array, callback) {
+  sort: (array, callback) => {
     if (type.isArray(array)) {
       if (type.isFunction(callback)) {
-        return array.sort(callback);
-      } else return array.sort(array);
-    } else throw new Error('sort function not contains array.');
+        return array.sort(callback)
+      } else return array.sort()
+    } else throw new Error('sort function not contains array.')
   }
-};
+}
diff --git a/src/boolean.js b/src/boolean.js
index 52c4be5..75da152 100644
--- a/src/boolean.js
+++ b/src/boolean.js
@@ -4,16 +4,16 @@ module.exports = {
    * @param {Boolean} bool : Get de boolean value.
    * @returns {Boolean} : Return true if value is true.
    */
-  'isTrue': function (bool) {
-    return bool === true;
+  isTrue: bool => {
+    return bool === true
   },
 
   /**
    * @param {Boolean} bool : Get de boolean value.
    * @returns {Boolean} : Return true if value is false.
    */
-  'isFalse': function (bool) {
-    return bool === false;
+  isFalse: bool => {
+    return bool === false
   },
 
   /**
@@ -21,16 +21,16 @@ module.exports = {
    * @param {Any} check : Get any value.
    * @returns {Boolean} : Return result of comparision.
    */
-  'isEqual': function (value, check) {
-    return JSON.stringify(value) === JSON.stringify(check);
+  isEqual: (value, check) => {
+    return JSON.stringify(value) === JSON.stringify(check)
   },
 
   /**
    * @param {Boolean} bool : Get de boolean value.
    * @returns {Boolean} : Return reverse boolean.
    */
-  'not': function (bool) {
-    return bool === false;
+  not: bool => {
+    return bool === false
   },
 
   /**
@@ -38,8 +38,8 @@ module.exports = {
    * @param {Boolean} bool2 : Get de boolean value.
    * @returns {Boolean} : Return comparation boolean.
    */
-  'and': function (bool, bool2) {
-    if (bool && bool2) return true;
-    else return false;
+  and: (bool, bool2) => {
+    if (bool && bool2) return true
+    else return false
   }
-};
+}
diff --git a/src/chain.js b/src/chain.js
index e78874a..3f98415 100644
--- a/src/chain.js
+++ b/src/chain.js
@@ -1,408 +1,428 @@
-var snc = require('snc');
-var tools = require('./tools');
-var type = require('tck');
-var array = require('./array');
-var object = require('./object');
-var string = require('./string');
-var number = require('./number');
-var boolean = require('./boolean');
-var events = require('./events');
-var generic = require('./generic');
-
-module.exports = function (data) {
-  if (type.isEmpty(data)) throw new Error('Chain function not contains values.');
-  else {
-    this.data = data;
-
-    //TOOLS
-    this.ifElse = function (funcTrue, funcFalse) {
-      this.data = tools.ifElse(this.data, funcTrue, funcFalse);
-      return this;
-    };
-
-    this.function = function (callback) {
-      this.data = tools.function(this.data, callback);
-      return this;
-    };
-
-    //STRING
-    this.toInt = function () {
-      this.data = string.toInt(this.data);
-      return this;
-    };
-
-    this.excerpt = function () {
-      this.data = string.excerpt(this.data);
-      return this;
-    };
-
-    this.dos2unix = function () {
-      this.data = string.dos2unix(this.data);
-      return this;
-    };
-
-    this.capitalize = function () {
-      this.data = string.capitalize(this.data);
-      return this;
-    };
-
-    this.toJSON = function () {
-      this.data = string.toJSON(this.data);
-      return this;
-    };
-
-    this.json = function () {
-      this.data = string.json(this.data);
-      return this;
-    };
-
-    this.split = function (separator, limit) {
-      this.data = string.split(this.data, separator, limit);
-      return this;
-    };
-
-    this.toLowerCase = function () {
-      this.data = string.toLowerCase(this.data);
-      return this;
-    };
-
-    this.toUpperCase = function () {
-      this.data = string.toUpperCase(this.data);
-      return this;
-    };
-
-    this.trim = function () {
-      this.data = string.trim(this.data);
-      return this;
-    };
-
-    this.replace = function (oldstr, newstr) {
-      this.data = string.replace(this.data, oldstr, newstr);
-      return this;
-    };
-
-    this.pad = function (target, pad) {
-      this.data = string.pad(this.data, target, pad);
-      return this;
-    };
-
-    //NUMBER
-    this.duplicate = function () {
-      this.data = number.duplicate(this.data);
-      return this;
-    };
-
-    this.min = function () {
-      this.data = number.min(this.data);
-      return this;
-    };
-
-    this.max = function () {
-      this.data = number.max(this.data);
-      return this;
-    };
-
-    this.sum = function (value) {
-      this.data = number.sum(this.data, value);
-      return this;
-    };
-
-    this.mult = function (value) {
-      this.data = number.mult(this.data, value);
-      return this;
-    };
-
-    this.divide = function (value) {
-      this.data = number.divide(this.data, value);
-      return this;
-    };
-
-    this.numerator = function (value) {
-      this.data = number.divide(value, this.data);
-      return this;
-    };
-
-    this.ceil = function () {
-      this.data = number.ceil(this.data);
-      return this;
-    };
-
-    this.round = function () {
-      this.data = number.round(this.data);
-      return this;
-    };
-
-    this.floor = function () {
-      this.data = number.floor(this.data);
-      return this;
-    };
-
-    this.trunc = function () {
-      this.data = number.trunc(this.data);
-      return this;
-    };
-
-    //GENERIC
-    this.toString = function () {
-      this.data = generic.toString(this.data);
-      return this;
-    };
-
-    this.size = function () {
-      this.data = generic.size(this.data);
-      return this;
-    };
-
-    this.contains = function (value) {
-      this.data = generic.contains(this.data, value);
-      return this;
-    };
-
-    this.reverse = function () {
-      this.data = generic.reverse(this.data);
-      return this;
-    };
-
-    this.repeatify = function (num) {
-      this.data = generic.repeatify(this.data, num);
-      return this;
-    };
-
-    this.concat = function (val) {
-      this.data = generic.concat(this.data, val);
-      return this;
-    };
-
-    //TYPE
-    this.isFunction = function () {
-      this.data = type.isFunction(this.data);
-      return this;
-    };
-
-    this.isArray = function () {
-      this.data = type.isArray(this.data);
-      return this;
-    };
-
-    this.isObject = function () {
-      this.data = type.isObject(this.data);
-      return this;
-    };
-
-    this.isNumber = function () {
-      this.data = type.isNumber(this.data);
-      return this;
-    };
-
-    this.isString = function () {
-      this.data = type.isString(this.data);
-      return this;
-    };
-
-    this.isBoolean = function () {
-      this.data = type.isBoolean(this.data);
-      return this;
-    };
-
-    this.isInteger = function () {
-      this.data = type.isInteger(this.data);
-      return this;
-    };
-
-    this.isEmpty = function () {
-      this.data = type.isEmpty(this.data);
-      return this;
-    };
-
-    this.empty = function () {
-      this.data = type.isEmpty(this.data);
-      return this;
-    };
-
-    this.isNull = function () {
-      this.data = type.isNull(this.data);
-      return this;
-    };
-
-    this.isNaN = function () {
-      this.data = type.isNaN(this.data);
-      return this;
-    };
-
-    this.isUndefined = function () {
-      this.data = type.isUndefined(this.data);
-      return this;
-    };
-
-    //ARRAY
-    this.shuffle = function () {
-      this.data = array.shuffle(this.data);
-      return this;
-    };
-
-    this.first = function () {
-      this.data = array.first(this.data);
-      return this;
-    };
-
-    this.last = function () {
-      this.data = array.last(this.data);
-      return this;
-    };
-
-    this.remove = function (object) {
-      this.data = array.remove(this.data, object);
-      return this;
-    };
-
-    this.clear = function () {
-      this.data = array.clear(this.data);
-      return this;
-    };
-
-    this.inArray = function (object) {
-      this.data = array.inArray(this.data, object);
-      return this;
-    };
-
-    this.unq = this.uniq = function () {
-      this.data = array.uniq(this.data);
-      return this;
-    };
-
-    this.uniqBy = function (object) {
-      this.data = array.uniq(this.data, object);
-      return this;
-    };
-
-    this.filter = function (func) {
-      this.data = array.filter(this.data, func);
-      return this;
-    };
-
-    this.filterBy = function (object) {
-      this.data = array.filterBy(this.data, object);
-      return this;
-    };
-
-    this.map = function (callback) {
-      this.data = array.map(this.data, callback);
-      return this;
-    };
-
-    this.reduce = function (callback) {
-      this.data = array.reduce(this.data, callback);
-      return this;
-    };
-
-    this.sort = function (callback) {
-      this.data = array.sort(this.data, callback);
-      return this;
-    };
-
-    this.forEach = function (callback) {
-      array.forEach(this.data, callback);
-    };
-
-    //OBJECT
-    this.extend = function (obj) {
-      this.data = object.extend(this.data, obj);
-      return this;
-    };
-
-    this.get =  function (route) {
-      this.data = object.get(this.data, route);
-      return this;
-    };
-
-    this.keys = function () {
-      this.data = object.keys(this.data);
-      return this;
-    };
-
-    this.getKeys = function () {
-      this.data = object.getKeys(this.data);
-      return this;
-    };
-
-    this.merge = function (obj) {
-      this.data = object.merge(this.data, obj);
-      return this;
-    };
-
-    //BOOLEAN
-    this.isTrue = function () {
-      this.data = boolean.isTrue(this.data);
-      return this;
-    };
-
-    this.isFalse = function () {
-      this.data = boolean.isFalse(this.data);
-      return this;
-    };
-
-    this.isEqual = function (value) {
-      this.data = boolean.isEqual(this.data, value);
-      return this;
-    };
-
-    this.eq = function (value) {
-      this.data = boolean.isEqual(this.data, value);
-      return this;
-    };
-
-    this.Not = function () {
-      this.data = boolean.not(this.data);
-      return this;
-    };
-
-    this.not = function () {
-      this.data = boolean.not(this.data);
-      return this;
-    };
-
-    //EVENT
-    this.on = function (ev, callback) {
-      events.on(ev, callback);
-      return this;
-    };
-
-    this.emit = function (ev) {
-      events.emit(ev, this.data);
-      return this;
-    };
-
-    this.delete = function (ev) {
-      events.delete(ev);
-      return this;
-    };
-
-    //ASYNCRONOUS SNC LIBRARY
-    this.each = function (callback, response) {
-      snc.each(this.data, callback, response);
-    };
-
-    this.epl = function (limit, callback, response) {
-      snc.epl(this.data, limit, callback, response);
-    };
-
-    this.and = function (data) {
-      if (this.data) {
-        this.data = data;
-        return this;
-      } else return false;
-
-    };
-
-    //RETURN VALUE
-    this.value = this.v = this.return = this.r = function () {
-      return this.data;
-    };
-
-    this.noReturn = this.end = function () {
-      return null;
-    };
-
-    return this;
-  }
-};
+const snc = require('snc')
+const type = require('tck')
+const events = require('eem')
+const tools = require('./tools')
+const array = require('./array')
+const object = require('./object')
+const string = require('./string')
+const number = require('./number')
+const boolean = require('./boolean')
+const generic = require('./generic')
+
+module.exports = class {
+  constructor(data) {
+    if (type.isEmpty(data)) throw new Error('Chain function not contains values.')
+    else {
+      this.data = data
+    }
+  }
+
+  //TOOLS
+  ifElse (funcTrue, funcFalse) {
+    this.data = tools.ifElse(this.data, funcTrue, funcFalse)
+    return this
+  }
+
+  function (callback) {
+    this.data = tools.function(this.data, callback)
+    return this
+  }
+
+  //STRING
+  toInt () {
+    this.data = string.toInt(this.data)
+    return this
+  }
+
+  excerpt () {
+    this.data = string.excerpt(this.data)
+    return this
+  }
+
+  dos2unix () {
+    this.data = string.dos2unix(this.data)
+    return this
+  }
+
+  capitalize () {
+    this.data = string.capitalize(this.data)
+    return this
+  }
+
+  toJSON () {
+    this.data = string.toJSON(this.data)
+    return this
+  }
+
+  json () {
+    this.data = string.json(this.data)
+    return this
+  }
+
+  split (separator, limit) {
+    this.data = string.split(this.data, separator, limit)
+    return this
+  }
+
+  toLowerCase () {
+    this.data = string.toLowerCase(this.data)
+    return this
+  }
+
+  toUpperCase () {
+    this.data = string.toUpperCase(this.data)
+    return this
+  }
+
+  trim () {
+    this.data = string.trim(this.data)
+    return this
+  }
+
+  replace (oldstr, newstr) {
+    data = string.replace(this.data, oldstr, newstr)
+    return this
+  }
+
+  pad (target, pad) {
+    data = string.pad(this.data, target, pad)
+    return this
+  }
+
+  //NUMBER
+  duplicate () {
+    this.data = number.duplicate(this.data)
+    return this
+  }
+
+  min () {
+    this.data = number.min(this.data)
+    return this
+  }
+
+  max () {
+    this.data = number.max(this.data)
+    return this
+  }
+
+  sum (value) {
+    this.data = number.sum(this.data, value)
+    return this
+  }
+
+  mult (value) {
+    this.data = number.mult(this.data, value)
+    return this
+  }
+
+  divide (value) {
+    this.data = number.divide(this.data, value)
+    return this
+  }
+
+  numerator (value) {
+    this.data = number.divide(value, this.data)
+    return this
+  }
+
+  ceil () {
+    this.data = number.ceil(this.data)
+    return this
+  }
+
+  round () {
+    this.data = number.round(this.data)
+    return this
+  }
+
+  floor () {
+    this.data = number.floor(this.data)
+    return this
+  }
+
+  trunc () {
+    this.data = number.trunc(this.data)
+    return this
+  }
+
+  //GENERIC
+  toString () {
+    this.data = generic.toString(this.data)
+    return this
+  }
+
+  size () {
+    this.data = generic.size(this.data)
+    return this
+  }
+
+  contains (value) {
+    this.data = generic.contains(this.data, value)
+    return this
+  }
+
+  reverse () {
+    this.data = generic.reverse(this.data)
+    return this
+  }
+
+  repeatify (num) {
+    this.data = generic.repeatify(this.data, num)
+    return this
+  }
+
+  concat (val) {
+    this.data = generic.concat(this.data, val)
+    return this
+  }
+
+  //TYPE
+  isFunction () {
+    this.data = type.isFunction(this.data)
+    return this
+  }
+
+  isArray () {
+    this.data = type.isArray(this.data)
+    return this
+  }
+
+  isObject () {
+    this.data = type.isObject(this.data)
+    return this
+  }
+
+  isNumber () {
+    this.data = type.isNumber(this.data)
+    return this
+  }
+
+  isString () {
+    this.data = type.isString(this.data)
+    return this
+  }
+
+  isBoolean () {
+    this.data = type.isBoolean(this.data)
+    return this
+  }
+
+  isInteger () {
+    this.data = type.isInteger(this.data)
+    return this
+  }
+
+  isEmpty () {
+    this.data = type.isEmpty(this.data)
+    return this
+  }
+
+  empty () {
+    this.data = type.isEmpty(this.data)
+    return this
+  }
+
+  isNull () {
+    this.data = type.isNull(this.data)
+    return this
+  }
+
+  isNaN () {
+    this.data = type.isNaN(this.data)
+    return this
+  }
+
+  isUndefined () {
+    this.data = type.isUndefined(this.data)
+    return this
+  }
+
+  //ARRAY
+  shuffle () {
+    this.data = array.shuffle(this.data)
+    return this
+  }
+
+  first () {
+    this.data = array.first(this.data)
+    return this
+  }
+
+  last () {
+    this.data = array.last(this.data)
+    return this
+  }
+
+  remove (object) {
+    this.data = array.remove(this.data, object)
+    return this
+  }
+
+  clear () {
+    this.data = array.clear(this.data)
+    return this
+  }
+
+  inArray (object) {
+    this.data = array.inArray(this.data, object)
+    return this
+  }
+
+  unq () {
+    this.data = array.uniq(this.data)
+    return this
+  }
+
+  uniq () {
+    this.data = array.uniq(this.data)
+    return this
+  }
+
+  uniqBy (object) {
+    this.data = array.uniq(this.data, object)
+    return this
+  }
+
+  filter (func) {
+    this.data = array.filter(this.data, func)
+    return this
+  }
+
+  filterBy (object) {
+    this.data = array.filterBy(this.data, object)
+    return this
+  }
+
+  map (callback) {
+    this.data = array.map(this.data, callback)
+    return this
+  }
+
+  reduce (callback) {
+    this.data = array.reduce(this.data, callback)
+    return this
+  }
+
+  sort (callback) {
+    this.data = array.sort(this.data, callback)
+    return this
+  }
+
+  forEach (callback) {
+    array.forEach(this.data, callback)
+  }
+
+  //OBJECT
+  extend (obj) {
+    this.data = object.extend(this.data, obj)
+    return this
+  }
+
+  get (route) {
+    this.data = object.get(this.data, route)
+    return this
+  }
+
+  keys () {
+    this.data = object.keys(this.data)
+    return this
+  }
+
+  getKeys () {
+    this.data = object.getKeys(this.data)
+    return this
+  }
+
+  merge (obj) {
+    this.data = object.merge(this.data, obj)
+    return this
+  }
+
+  //BOOLEAN
+  isTrue () {
+    this.data = boolean.isTrue(this.data)
+    return this
+  }
+
+  isFalse () {
+    this.data = boolean.isFalse(this.data)
+    return this
+  }
+
+  isEqual (value) {
+    this.data = boolean.isEqual(this.data, value)
+    return this
+  }
+
+  eq (value) {
+    this.data = boolean.isEqual(this.data, value)
+    return this
+  }
+
+  Not () {
+    this.data = boolean.not(this.data)
+    return this
+  }
+
+  not () {
+    this.data = boolean.not(this.data)
+    return this
+  }
+
+  //EVENT
+  on (ev, callback) {
+    events.on(ev, callback)
+    return this
+  }
+
+  emit (ev) {
+    events.emit(ev, this.data)
+    return this
+  }
+
+  delete (ev) {
+    events.delete(ev)
+    return this
+  }
+
+  //ASYNCRONOUS SNC LIBRARY
+  each (callback, response) {
+    snc.each(this.data, callback, response)
+  }
+
+  epl (limit, callback, response) {
+    snc.epl(this.data, limit, callback, response)
+  }
+
+  and (data) {
+    if (this.data) {
+      this.data = data
+      return this
+    } else return false
+  }
+
+  //RETURN VALUE
+  r () {
+    return this.data
+  }
+
+  return () {
+    return this.data
+  }
+
+  v () {
+    return this.data
+  }
+
+  value () {
+    return this.data
+  }
+
+  end () {
+    return null
+  }
+  
+  noReturn () {
+    return null
+  }
+}
diff --git a/src/events.js b/src/events.js
deleted file mode 100644
index 193d434..0000000
--- a/src/events.js
+++ /dev/null
@@ -1,47 +0,0 @@
-var type = require('tck');
-
-var events = {
-  'eventstack': {},
-
-  /**
-   * @param {String} ev : The name of event.
-   * @param {Function} callback : Function executed when event is triggered.
-   * @returns {undefined}
-   */
-  'on': function (ev, callback) {
-    if (type.isEmpty(ev)) throw new Error('on function need event');
-    else if (type.isArray(ev)) {
-      for (var y = 0; y < ev.length; y++) {
-        if (type.isFunction(callback)) events.eventstack[ev[y]] = callback;
-        else throw Error('Event need function');
-      }
-    } else if (type.isFunction(callback)) events.eventstack[ev] = callback;
-    else throw Error('Event need function');
-  },
-
-  /**
-   * @param {String} ev : The name of event.
-   * @param {Any} data : Data for a event callback.
-   * @returns {undefined}
-   */
-  'emit': function (ev, data) {
-    if (type.isEmpty(ev)) throw new Error('No event selected.');
-    else if (type.isArray(ev)) {
-      for (var i = 0; i < ev.length; i++) {
-        if (type.isFunction(events.eventstack[ev[i]])) events.eventstack[ev[i]](data, this.data);
-      }
-    } else if (type.isFunction(events.eventstack[ev])) events.eventstack[ev](data, this.data);
-  },
-
-  /**
-   * @param {String} ev : The name of event for destroy.
-   * @returns {undefined}
-   */
-  'delete': function (ev) {
-    if (type.isEmpty(ev)) throw new Error('No event selected.');
-    else if (type.isEmpty(events.eventstack[ev])) throw Error('This event not exist');
-    else delete events.eventstack[ev];
-  }
-};
-
-module.exports = events;
diff --git a/src/generic.js b/src/generic.js
index 9d9538a..64882e4 100644
--- a/src/generic.js
+++ b/src/generic.js
@@ -1,4 +1,4 @@
-var type = require('tck');
+const type = require('tck')
 
 module.exports = {
 
@@ -6,21 +6,21 @@ module.exports = {
    * @param {Any} data : Data for stringify.
    * @returns {String} : Return stringify from Any.
    */
-  'toString': function (data) {
-    if (type.isEmpty(data)) throw new Error('toString function not contains value to parse.');
-    else return JSON.stringify(data);
+  toString: data => {
+    if (type.isEmpty(data)) throw new Error('toString function not contains value to parse.')
+    else return JSON.stringify(data)
   },
 
   /**
    * @param {Array|String|Object} data : Data for check length.
    * @returns {Number} : Return data length.
    */
-  'size': function (data) {
-    if (type.isEmpty(data)) throw new Error('size function not contains values.');
+  size: data => {
+    if (type.isEmpty(data)) throw new Error('size function not contains values.')
     else {
-      if (type.isArray(data) || type.isString(data)) return data.length;
-      else if (type.isObject(data)) return Object.keys(data).length;
-      else throw new Error('size function not contains compatible values.');
+      if (type.isArray(data) || type.isString(data)) return data.length
+      else if (type.isObject(data)) return Object.keys(data).length
+      else throw new Error('size function not contains compatible values.')
     }
   },
 
@@ -29,20 +29,20 @@ module.exports = {
    * @param {String} value : Value for search in data.
    * @returns {Boolean} : Return true or false if data contains a value.
    */
-  'contains': function (data, value) {
-    if (type.isArray(data) || type.isString(data)) return !!~data.indexOf(value);
-    else if (type.isObject(data)) return !!~Object.keys(data).indexOf(value);
-    else throw new Error('contains function not contains values.');
+  contains: (data, value) => {
+    if (type.isArray(data) || type.isString(data)) return !!~data.indexOf(value)
+    else if (type.isObject(data)) return !!~Object.keys(data).indexOf(value)
+    else throw new Error('contains function not contains values.')
   },
 
   /**
    * @param {Array|String} data : Array or String for process
    * @returns {Array|String} : Return data in reverse order.
    */
-  'reverse': function (data) {
-    if (type.isArray(data)) return data.reverse();
-    else if (type.isString(data)) return data.split('').reverse().join('');
-    else throw new Error('Reverse function not contains array or string.');
+  reverse: data => {
+    if (type.isArray(data)) return data.reverse()
+    else if (type.isString(data)) return data.split('').reverse().join('')
+    else throw new Error('Reverse function not contains array or string.')
   },
 
   /**
@@ -50,13 +50,13 @@ module.exports = {
    * @param {Number} num : Number of elements in array.
    * @returns {Array} : Return array with data repeated.
    */
-  'repeatify': function (data, num) {
-    if (type.isEmpty(data)) throw new Error('repeatify function not have data for repeat.');
-    else if (type.isEmpty(num) || type.isNumber(num)) throw new Error('repeatify function not have a number for repeat.');
+  repeatify: (data, num) => {
+    if (type.isEmpty(data)) throw new Error('repeatify function not have data for repeat.')
+    else if (type.isEmpty(num) || !type.isNumber(num)) throw new Error('repeatify function not have a number for repeat.')
     else {
-      var strArray = [];
-      for (var i = 0; i < num; i++) strArray.push(data);
-      return strArray;
+      var strArray = []
+      for (let i = 0; i < num; i++) strArray.push(data)
+      return strArray
     }
   },
 
@@ -65,12 +65,12 @@ module.exports = {
    * @param {String|Array} val1 : Data for concatenate
    * @returns {String|Array} : Return concatenate data
    */
-  'concat': function (val, val1) {
-    if (type.isEmpty(val) || type.isEmpty(val1)) throw new Error('concat function not have values.');
+  concat: (val, val1) => {
+    if (type.isEmpty(val) || type.isEmpty(val1)) throw new Error('concat function not have values.')
     else {
-      if (type.isString(val) && type.isString(val)) return val + val1;
-      else if (type.isArray(val) && type.isArray(val)) return val.concat(val1);
-      else throw new Error('concat function not contains same values.');
+      if (type.isString(val) && type.isString(val)) return val + val1
+      else if (type.isArray(val) && type.isArray(val)) return val.concat(val1)
+      else throw new Error('concat function not contains same values.')
     }
   },
 
@@ -78,7 +78,7 @@ module.exports = {
    * @param {Any} data : Date for return
    * @returns {Any} : Return any data passed for param.
    */
-  'return': function (data) {
-    return data;
+  return: data => {
+    return data
   }
-};
+}
diff --git a/src/main.js b/src/main.js
index 2c3b3df..d96057d 100644
--- a/src/main.js
+++ b/src/main.js
@@ -1,135 +1,135 @@
 // http://www.spellbook.io
-var snc = require('snc');
-var type = require('tck');
-var tools = require('./tools');
-var array = require('./array');
-var object = require('./object');
-var string = require('./string');
-var number = require('./number');
-var boolean = require('./boolean');
-var generic = require('./generic');
-var events = require('./events');
-var Chain = require('./chain');
+const snc = require('snc')
+const type = require('tck')
+const events = require('eem')
+const tools = require('./tools')
+const array = require('./array')
+const object = require('./object')
+const string = require('./string')
+const number = require('./number')
+const boolean = require('./boolean')
+const generic = require('./generic')
+const Chain = require('./chain')
 
 module.exports = {
-  "range": tools.range,
-  "random": tools.random,
-  "ifElse": tools.ifElse,
-  "function": tools.function,
+  range: tools.range,
+  random: tools.random,
+  ifElse: tools.ifElse,
+  function: tools.function,
 
   //STRING
-  "toInt": string.toInt,
-  "excerpt": string.excerpt,
-  "capitalize": string.capitalize,
-  "toJSON": string.toJSON,
-  "json": string.json,
-  "dos2unix": string.dos2unix,
-  "split": string.split,
-  "toUpperCase": string.toUpperCase,
-  "toLowerCase": string.toLowerCase,
-  "trim": string.trim,
-  "replace": string.replace,
-  "pad": string.pad,
+  toInt: string.toInt,
+  excerpt: string.excerpt,
+  capitalize: string.capitalize,
+  toJSON: string.toJSON,
+  json: string.json,
+  dos2unix: string.dos2unix,
+  split: string.split,
+  toUpperCase: string.toUpperCase,
+  toLowerCase: string.toLowerCase,
+  trim: string.trim,
+  replace: string.replace,
+  pad: string.pad,
 
   //NUMBER
-  "duplicate": number.duplicate,
-  "sum": number.sum,
-  "min": number.min,
-  "max": number.max,
-  "divide": number.divide,
-  "mult": number.mult,
-  "ceil": number.ceil,
-  "round": number.round,
-  "floor": number.floor,
-  "trunc": number.trunc,
+  duplicate: number.duplicate,
+  sum: number.sum,
+  min: number.min,
+  max: number.max,
+  divide: number.divide,
+  mult: number.mult,
+  ceil: number.ceil,
+  round: number.round,
+  floor: number.floor,
+  trunc: number.trunc,
 
   //GENERIC
-  "toString": generic.toString,
-  "size": generic.size,
-  "contains": generic.contains,
-  "reverse": generic.reverse,
-  "repeatify": generic.repeatify,
-  "concat": generic.concat,
-  "return": generic.return,
+  toString: generic.toString,
+  size: generic.size,
+  contains: generic.contains,
+  reverse: generic.reverse,
+  repeatify: generic.repeatify,
+  concat: generic.concat,
+  return: generic.return,
 
   //TYPE
-  "isFunction": type.isFunction,
-  "isArray": type.isArray,
-  "isObject": type.isObject,
-  "isNumber": type.isNumber,
-  "isString": type.isString,
-  "isBoolean": type.isBoolean,
-  "isInteger": type.isInteger,
-  "isEmpty": type.isEmpty,
-  "empty": type.isEmpty,
-  "isNull": type.isNull,
-  "isNaN": type.isNaN,
-  "isUndefined": type.isUndefined,
-  "e": function (obj, keys) {
-    return type.isEmpty(object.get(obj, keys));
+  isFunction: type.isFunction,
+  isArray: type.isArray,
+  isObject: type.isObject,
+  isNumber: type.isNumber,
+  isString: type.isString,
+  isBoolean: type.isBoolean,
+  isInteger: type.isInteger,
+  isEmpty: type.isEmpty,
+  empty: type.isEmpty,
+  isNull: type.isNull,
+  isNaN: type.isNaN,
+  isUndefined: type.isUndefined,
+  e: (obj, keys) => {
+    return type.isEmpty(object.get(obj, keys))
   },
 
   //ARRAY
-  "shuffle": array.shuffle,
-  "first": array.first,
-  "last": array.last,
-  "remove": array.remove,
-  "clear": array.clear,
-  "inArray": array.inArray,
-  "unq": array.uniq,
-  "uniq": array.uniq,
-  "uniqBy": array.uniqBy,
-  "filter": array.filter,
-  "filterBy": array.filterBy,
-  "map": array.map,
-  "reduce": array.reduce,
-  "sort": array.sort,
-  "forEach": array.forEach,
+  shuffle: array.shuffle,
+  first: array.first,
+  last: array.last,
+  remove: array.remove,
+  clear: array.clear,
+  inArray: array.inArray,
+  unq: array.uniq,
+  uniq: array.uniq,
+  uniqBy: array.uniqBy,
+  filter: array.filter,
+  filterBy: array.filterBy,
+  map: array.map,
+  reduce: array.reduce,
+  sort: array.sort,
+  forEach: array.forEach,
 
   //OBJECT
-  "extend": object.extend,
-  "assign": object.assign,
-  "clone": object.assign,
-  "get": object.get,
-  "keys": object.keys,
-  "getKeys": object.getKeys,
-  "merge": object.merge,
+  extend: object.extend,
+  assign: object.assign,
+  clone: object.assign,
+  get: object.get,
+  keys: object.keys,
+  getKeys: object.getKeys,
+  merge: object.merge,
 
   //boolean
-  "isTrue": boolean.isTrue,
-  "isFalse": boolean.isFalse,
-  "isEqual": boolean.isEqual,
-  "eq": boolean.isEqual,
-  "Not": boolean.Not,
+  isTrue: boolean.isTrue,
+  isFalse: boolean.isFalse,
+  isEqual: boolean.isEqual,
+  eq: boolean.isEqual,
+  Not: boolean.Not,
 
   //EVENT
-  "on": events.on,
-  "emit": events.emit,
-  "delete": events.delete,
+  on: events.on,
+  emit: events.emit,
+  delete: events.delete,
 
   //ASYNCRONOUS SNC LIBRARY
-  "each": snc.each,
-  "waterfall": snc.waterfall,
-  "wf": snc.waterfall,
-  "forever": snc.forever,
-  "fe": snc.forever,
-  "parallel": snc.parallel,
-  "par": snc.parallel,
-  "parallelLimit": snc.parallelLimit,
-  "pl": snc.parallelLimit,
-  "epl": snc.epl,
-  "eachpl": snc.eachpl,
-  "eachParallelLimit": snc.eachParallelLimit,
-  "for": snc.forSync,
-  "forSync": snc.forSync,
-  "times": snc.times,
+  each: snc.each,
+  waterfall: snc.waterfall,
+  wf: snc.waterfall,
+  forever: snc.forever,
+  fe: snc.forever,
+  parallel: snc.parallel,
+  par: snc.parallel,
+  parallelLimit: snc.parallelLimit,
+  pl: snc.parallelLimit,
+  epl: snc.epl,
+  eachpl: snc.eachpl,
+  eachParallelLimit: snc.eachParallelLimit,
+  for: snc.forSync,
+  forSync: snc.forSync,
+  times: snc.times,
 
   //CHAIN
-  "chain": function (data) {
-    return new Chain(data);
+  chain: data => {
+    return new Chain(data)
   },
 
-  "c": function (data) {
-    return new Chain(data);
+  c: data => {
+    return new Chain(data)
   }
-};
+}
diff --git a/src/number.js b/src/number.js
index edd98ac..ce06346 100644
--- a/src/number.js
+++ b/src/number.js
@@ -1,63 +1,63 @@
-var type = require('tck');
+const type = require('tck')
 
 module.exports = {
-  'duplicate': function (value) {
-    if (type.isNumber(value)) return value * 2;
-    else throw new Error('Duplicate function needs a number.');
+  duplicate: value => {
+    if (type.isNumber(value)) return value * 2
+    else throw new Error('Duplicate function needs a number.')
   },
-  'min': function (value) {
+  min: value => {
     if (type.isArray(value)) {
-      var checknum = true;
-      value.forEach(function (num) {
-        if (checknum && !type.isNumber(num)) checknum = false;
-      });
-      if (checknum) return Math.min.apply(Math, value);
-      else throw new Error('Min funciton needs an array of numbers.');
-    } else throw new Error('Min funciton needs an array.');
-  },
-  'max': function (value) {
+      var checknum = true
+      value.forEach(num => {
+        if (checknum && !type.isNumber(num)) checknum = false
+      })
+      if (checknum) return Math.min.apply(Math, value)
+      else throw new Error('Min funciton needs an array of numbers.')
+    } else throw new Error('Min funciton needs an array.')
+  },
+  max: value => {
     if (type.isArray(value)) {
-      var checknum = true;
-      value.forEach(function (num) {
-        if (checknum && !type.isNumber(num)) checknum = false;
-      });
-      if (checknum) return Math.max.apply(Math, value);
-      else throw new Error('Min funciton needs an array of numbers.');
-    } else throw new Error('Min funciton needs an array.');
-  },
-  'sum': function (value, number) {
+      var checknum = true
+      value.forEach(num => {
+        if (checknum && !type.isNumber(num)) checknum = false
+      })
+      if (checknum) return Math.max.apply(Math, value)
+      else throw new Error('Min funciton needs an array of numbers.')
+    } else throw new Error('Min funciton needs an array.')
+  },
+  sum: (value, number) => {
     if (type.isNumber(value) && type.isNumber(number)) {
-      return value + number;
-    } else throw new Error('Sum function only can operate with numbers.');
+      return value + number
+    } else throw new Error('Sum function only can operate with numbers.')
   },
-  'divide': function (value, number) {
+  divide: (value, number) => {
     if (type.isNumber(value) && type.isNumber(number)) {
-      return value / number;
-    } else throw new Error('Divide function only can operate with numbers.');
+      return value / number
+    } else throw new Error('Divide function only can operate with numbers.')
   },
-  'mult': function (value, number) {
+  mult: (value, number) => {
     if (type.isNumber(value) && type.isNumber(number)) {
-      return number * value;
-    } else throw new Error('Mult function only can operate with numbers.');
+      return number * value
+    } else throw new Error('Mult function only can operate with numbers.')
   },
-  'ceil': function (value) {
+  ceil: value => {
     if (type.isNumber(value)) {
-      return Math.ceil(value);
-    } else throw new Error('ceil function only can operate with numbers.');
+      return Math.ceil(value)
+    } else throw new Error('ceil function only can operate with numbers.')
   },
-  'round': function (value) {
+  round: value => {
     if (type.isNumber(value)) {
-      return Math.round(value);
-    } else throw new Error('round function only can operate with numbers.');
+      return Math.round(value)
+    } else throw new Error('round function only can operate with numbers.')
   },
-  'floor': function (value) {
+  floor: value => {
     if (type.isNumber(value)) {
-      return Math.floor(value);
-    } else throw new Error('floor function only can operate with numbers.');
+      return Math.floor(value)
+    } else throw new Error('floor function only can operate with numbers.')
   },
-  'trunc': function (value) {
+  trunc: value => {
     if (type.isNumber(value)) {
-      return Math.trunc(value);
-    } else throw new Error('floor function only can operate with numbers.');
+      return Math.trunc(value)
+    } else throw new Error('floor function only can operate with numbers.')
   }
-};
+}
diff --git a/src/object.js b/src/object.js
index 034cd13..9f3c671 100644
--- a/src/object.js
+++ b/src/object.js
@@ -1,60 +1,60 @@
-var type = require('tck');
+const type = require('tck')
 
 module.exports = {
-  'extend': function (obj, obj2) {
+  extend: (obj, obj2) => {
     for (var i in obj2) {
-      if (obj2.hasOwnProperty(i)) obj[i] = obj2[i];
+      if (obj2.hasOwnProperty(i)) obj[i] = obj2[i]
     }
-    return obj;
+    return obj
   },
-  'assign': function (obj) {
-    if(obj === null || typeof(obj) !== 'object' || 'isActiveClone' in obj) return obj;
+  assign: obj => {
+    if(type.isNull(obj) || !type.isObject(obj) || 'isActiveClone' in obj) return obj
 
-    var temp = obj.constructor();
-    for(var key in obj) {
+    var temp = obj.constructor()
+    for (let key in obj) {
       if(Object.prototype.hasOwnProperty.call(obj, key)) {
-        obj.isActiveClone = null;
-        temp[key] = obj[key];
-        delete obj.isActiveClone;
+        obj.isActiveClone = null
+        temp[key] = obj[key]
+        delete obj.isActiveClone
       }
     }
-    return temp;
+    return temp
   },
-  'get': function (obj, route) {
-    if (obj !== undefined && typeof route === "string") {
-      route = route.split(".");
-      if (route.length === 1 ) return obj[route[0]];
+  get: (obj, route) => {
+    if (!type.isEmpty(obj) && type.isString(route)) {
+      route = route.split(".")
+      if (route.length === 1 ) return obj[route[0]]
       else {
         for (var i = 0; i < route.length; i++) {
-          if (obj[route[i]] !== undefined) obj = obj[route[i]];
-          else return undefined;
+          if (!type.isEmpty(obj[route[i]])) obj = obj[route[i]]
+          else return undefined
         }
-        return obj;
+        return obj
       }
-    } else return undefined;
+    } else return undefined
   },
-  'keys': function (obj) {
-    return Object.keys(obj);
+  keys: obj => {
+    return Object.keys(obj)
   },
-  'getKeys': function (obj, keys) {
-    var nobj = {};
+  getKeys: (obj, keys) => {
+    var nobj = {}
     if (type.isArray(keys)) {
-      keys.forEach(function (key) {
-        nobj[key] = obj[key];
-      });
-    } else nobj[keys] = obj[keys];
-    return nobj;
+      keys.forEach(key => {
+        nobj[key] = obj[key]
+      })
+    } else nobj[keys] = obj[keys]
+    return nobj
   },
-  'merge': function (obj, obj2) {
-    var nobj = {};
+  merge: (obj, obj2) => {
+    var nobj = {}
     if (type.isObject(obj) && type.isObject(obj2)) {
-      Object.keys(obj).forEach(function (key) {
-        nobj[key] = obj[key];
-      });
-      Object.keys(obj2).forEach(function (key) {
-        nobj[key] = obj2[key];
-      });
-      return nobj;
-    } else throw new Error('Merge option need two objects for work');
+      Object.keys(obj).forEach(key => {
+        nobj[key] = obj[key]
+      })
+      Object.keys(obj2).forEach(key => {
+        nobj[key] = obj2[key]
+      })
+      return nobj
+    } else throw new Error('Merge option need two objects for work')
   }
-};
+}
diff --git a/src/string.js b/src/string.js
index e268caf..eea09ac 100644
--- a/src/string.js
+++ b/src/string.js
@@ -1,73 +1,73 @@
-var type = require('tck');
+const type = require('tck')
 
 module.exports = {
-  'toInt': function (value) {
-    if (type.isEmpty(value)) throw new Error('To int needs an string value.');
-    else if (type.isString(value)) return parseInt(value,10);
-    else throw new Error('toInt function has incompatible value.');
+  toInt: value => {
+    if (type.isEmpty(value)) throw new Error('To int needs an string value.')
+    else if (type.isString(value)) return parseInt(value,10)
+    else throw new Error('toInt function has incompatible value.')
   },
-  'dos2unix': function (value) {
-    if (type.isEmpty(value)) throw new Error('Dos2unix function needs an string value.');
-    else if (type.isString(value)) return value.replace(/\r\n/g, '\n');
-    else throw new Error('Dos2unix function has incompatible value.');
+  dos2unix: value => {
+    if (type.isEmpty(value)) throw new Error('Dos2unix function needs an string value.')
+    else if (type.isString(value)) return value.replace(/\r\n/g, '\n')
+    else throw new Error('Dos2unix function has incompatible value.')
   },
-  'capitalize': function (value) {
-    if (type.isEmpty(value)) throw new Error('Capitalize function needs an string value.');
-    else if (type.isString(value)) return value.slice(0,1).toUpperCase() + value.slice(1);
-    else throw new Error('Capitalize function has incompatible value.');
+  capitalize: value => {
+    if (type.isEmpty(value)) throw new Error('Capitalize function needs an string value.')
+    else if (type.isString(value)) return value.slice(0,1).toUpperCase() + value.slice(1)
+    else throw new Error('Capitalize function has incompatible value.')
   },
-  'excerpt': function (data, nwords) {
-    var words = data.split(' ');
-    words.splice(nwords, words.length-1);
-    return words.join(' ');
+  excerpt: (data, nwords) => {
+    var words = data.split(' ')
+    words.splice(nwords, words.length-1)
+    return words.join(' ')
   },
-  'toJSON': function (value) {
-    if (type.isEmpty(value)) throw new Error('toJSON function needs an string value.');
-    else if (type.isString(value)) return JSON.parse(value);
-    else throw new Error('toJSON function has incompatible value.');
+  toJSON: value => {
+    if (type.isEmpty(value)) throw new Error('toJSON function needs an string value.')
+    else if (type.isString(value)) return JSON.parse(value)
+    else throw new Error('toJSON function has incompatible value.')
   },
-  'json': function (value) {
-    if (type.isEmpty(value)) throw new Error('toJSON function needs an string value.');
-    else if (type.isString(value)) return JSON.parse(value);
-    else throw new Error('toJSON function has incompatible value.');
+  json: value => {
+    if (type.isEmpty(value)) throw new Error('toJSON function needs an string value.')
+    else if (type.isString(value)) return JSON.parse(value)
+    else throw new Error('toJSON function has incompatible value.')
   },
-  'split': function (value, separator, limit) {
-    if (type.isEmpty(value)) throw new Error('Split function needs an string value.');
-    else if (type.isString(value)) return value.split(separator, limit);
-    else throw new Error('Split function has incompatible value.');
+  split: (value, separator, limit) => {
+    if (type.isEmpty(value)) throw new Error('Split function needs an string value.')
+    else if (type.isString(value)) return value.split(separator, limit)
+    else throw new Error('Split function has incompatible value.')
   },
-  'toLowerCase': function (value) {
-    if (type.isEmpty(value)) throw new Error('toLowerCase function needs an string value.');
-    else if (type.isString(value)) return value.toLowerCase();
-    else throw new Error('toLowerCase function has incompatible value.');
+  toLowerCase: value => {
+    if (type.isEmpty(value)) throw new Error('toLowerCase function needs an string value.')
+    else if (type.isString(value)) return value.toLowerCase()
+    else throw new Error('toLowerCase function has incompatible value.')
 
   },
-  'toUpperCase': function (value) {
-    if (type.isEmpty(value)) throw new Error('toUpperCase function needs an string value.');
-    else if (type.isString(value)) return value.toUpperCase();
-    else throw new Error('toUpperCase function has incompatible value.');
+  toUpperCase: value => {
+    if (type.isEmpty(value)) throw new Error('toUpperCase function needs an string value.')
+    else if (type.isString(value)) return value.toUpperCase()
+    else throw new Error('toUpperCase function has incompatible value.')
   },
-  'trim': function (value) {
-    if (type.isEmpty(value)) throw new Error('trim function needs an string value.');
-    else if (type.isString(value)) return value.trim();
-    else throw new Error('trim function has incompatible value.');
+  trim: value => {
+    if (type.isEmpty(value)) throw new Error('trim function needs an string value.')
+    else if (type.isString(value)) return value.trim()
+    else throw new Error('trim function has incompatible value.')
   },
-  'replace': function (value, oldregex, newstr) {
-    if (type.isEmpty(value) && type.isEmpty(newstr)) throw new Error('replace function needs an string value.');
-    else if (type.isString(value) && type.isString(newstr)) return value.replace(oldregex, newstr);
-    else throw new Error('replace function has incompatible value.');
+  replace: (value, oldregex, newstr) => {
+    if (type.isEmpty(value) && type.isEmpty(newstr)) throw new Error('replace function needs an string value.')
+    else if (type.isString(value) && type.isString(newstr)) return value.replace(oldregex, newstr)
+    else throw new Error('replace function has incompatible value.')
   },
-  'pad': function (chain, targetLength,padString) {
-    targetLength = targetLength>>0;
-    padString = String(padString || ' ');
+  pad: (chain, targetLength,padString) => {
+    targetLength = targetLength>>0
+    padString = String(padString || ' ')
     if (chain.length > targetLength) {
-      return String(chain);
+      return String(chain)
     } else {
-      targetLength = targetLength-chain.length;
+      targetLength = targetLength-chain.length
       if (targetLength > padString.length) {
-        padString += padString.repeat(targetLength/padString.length);
+        padString += padString.repeat(targetLength/padString.length)
       }
-      return padString.slice(0,targetLength) + String(chain);
+      return padString.slice(0,targetLength) + String(chain)
     }
   }
-};
+}
diff --git a/src/tools.js b/src/tools.js
index af2a044..a3b71ea 100644
--- a/src/tools.js
+++ b/src/tools.js
@@ -1,42 +1,42 @@
-var type = require('tck');
+const type = require('tck')
 
 module.exports = {
-  'range': function (a, b, step) {
-    var A = [];
-    if (type.isEmpty(a) || type.isEmpty(b)) return [];
-    if (typeof a !== typeof b) return [];
+  range: (a, b, step) => {
+    var A = []
+    if (type.isEmpty(a) || type.isEmpty(b)) return []
+    if (typeof a !== typeof b) return []
     else {
       if (type.isNumber(a)) {
-        A[0] = a;
-        step = step || 1;
-        while (a+step<= b) A[A.length] = a += step;
+        A[0] = a
+        step = step || 1
+        while (a+step<= b) A[A.length] = a += step
       } else {
-        var s = 'abcdefghijklmnopqrstuvwxyz';
+        var s = 'abcdefghijklmnopqrstuvwxyz'
         if (a === a.toUpperCase()) {
-          b = b.toUpperCase();
-          s = s.toUpperCase();
+          b = b.toUpperCase()
+          s = s.toUpperCase()
         }
-        s = s.substring(s.indexOf(a), s.indexOf(b)+ 1);
-        A = s.split('');
+        s = s.substring(s.indexOf(a), s.indexOf(b)+ 1)
+        A = s.split('')
       }
-      return A;
+      return A
     }
   },
-  'random': function (min, max) {
-    if (type.isNumber(min) && type.isNumber(max)) return Math.floor(Math.random() * (max - min)) + min;
+  random: (min, max) => {
+    if (type.isNumber(min) && type.isNumber(max)) return Math.floor(Math.random() * (max - min)) + min
     else {
-      if(!type.isArray(min)) return 0;
+      if(!type.isArray(min)) return 0
       else {
-        var index = Math.floor(Math.random() * (min.length));
-        return min[index];
+        var index = Math.floor(Math.random() * (min.length))
+        return min[index]
       }
     }
   },
-  'ifElse': function (condition, funcTrue, funcFalse) {
-    if (condition) return funcTrue();
-    else return funcFalse();
+  ifElse: (condition, funcTrue, funcFalse) => {
+    if (condition) return funcTrue()
+    else return funcFalse()
   },
-  'function': function (data, callback) {
-    return callback(data);
+  function: (data, callback) => {
+    return callback(data)
   }
-};
+}
diff --git a/test/array.test.js b/test/array.test.js
index 9676296..c479971 100644
--- a/test/array.test.js
+++ b/test/array.test.js
@@ -1,9 +1,9 @@
 /*global describe it*/
 
-var chai = require('chai');
-var sb = require('../src/main');
+const chai = require('chai')
+const sb = require('../src/main')
 
-describe('Array', function () {
+describe('Array', () => {
 
   var arraytest = [{
     "a": 1,
@@ -14,237 +14,243 @@ describe('Array', function () {
   }, {
     "a": 2,
     "b": 3
-  }];
-
-  describe('sb.shuffle()', function () {
-    var array = [1,2,3,4,5];
-    it('Check if numbers array returns array', function () {
-      var res = sb.shuffle(array);
-      chai.assert.isArray(res);
-    });
-
-    it('Check if numbers array returns array of numbers', function () {
-      for (var i = 0; i < array.length; i++) {
-        chai.assert.isNumber(array[i]);
+  }]
+
+  describe('sb.shuffle()', () => {
+    it('Check if numbers array returns array', () => {
+      const array = [1,2,3,4,5]
+      const res = sb.shuffle(array)
+      chai.assert.isArray(res)
+    })
+
+    it('Check if numbers array returns array of numbers', () => {
+      const array = [1,2,3,4,5]
+      const res = sb.shuffle(array)
+      for (let i = 0; i < res.length; i++) {
+        chai.assert.isNumber(res[i])
       }
-    });
-
-    it('Check if numbers array have a same length', function () {
-      var res = sb.shuffle(array);
-      chai.assert.lengthOf(res, array.length);
-    });
-
-    it('Check if contains the same values', function () {
-      var res = sb.shuffle(array);
-      array.forEach(function (value) {
-        chai.expect(res).to.include(value);
-      });
-    });
-
-    it('Check the array is no\'t the same order', function () {
-      var res = sb.shuffle(array);
-      chai.assert.notStrictEqual(array, res, 'These array values are not strictly equal');
-    });
-  });
-
-
-  describe('sb.first()', function () {
-    var array = ['a','b','c'];
-    it('Check first element is correct', function () {
-      var res = sb.first(array);
-      chai.assert.isString(res);
-      chai.assert.equal(res, 'a');
-    });
-  });
-
-  describe('sb.last()', function () {
-    var array = ['a','b','c'];
-    it('Check if last element is correct', function () {
-      var res = sb.last(array);
-      chai.assert.isString(res);
-      chai.assert.equal(res, 'c');
-    });
-  });
-
-  describe('sb.remove()', function () {
-    var objArray = [{"a": 1}, {"a": 2}, {"b": 3}];
-    var numberArray = [1, 2, 6];
-    var stringArray = ["1", "2", "6"];
-
-    it('Delete a number', function () {
-      var res = sb.remove(numberArray, 2);
-      chai.assert.lengthOf(res, 2);
-      chai.assert.isArray(res);
-    });
-
-    it('Delete a multiple numbers', function () {
-      var res = sb.remove(numberArray, [2,6]);
-      chai.assert.lengthOf(res, 1);
-      chai.assert.isArray(res);
-    });
-
-    it('Delete a object', function () {
-      var res = sb.remove(objArray, {"b": 3});
-      chai.assert.lengthOf(res, 2);
-      chai.assert.isArray(res);
-    });
-
-    it('Delete multiple objects', function () {
-      var res = sb.remove(objArray, [{"b": 3}, {"a": 1}]);
-      chai.assert.lengthOf(res, 1);
-      chai.assert.isArray(res);
-    });
-
-    it('Delete string', function () {
-      var res = sb.remove(stringArray, "2");
-      chai.assert.lengthOf(res, 2);
-      chai.assert.isArray(res);
-    });
-
-    it('Delete multiple string', function () {
-      var res = sb.remove(stringArray, ["6", "2"]);
-      chai.assert.lengthOf(res, 1);
-      chai.assert.isArray(res);
-    });
-  });
-
-  describe('sb.clear()', function () {
-    var array = [1,2,3];
-    it('Check is a array', function () {
-      var res = sb.clear(array);
-      chai.assert.isArray(res);
-    });
-
-    it('Check length is 0', function () {
-      var res = sb.clear(array);
-      chai.assert.lengthOf(res, 0);
-    });
-  });
-
-  describe('sb.inArray()', function () {
-    var numberArray = [1, 2, 3];
-    var stringArray = ['1', '2', '3'];
-
-    it('Check if contains number return true', function () {
-      var res = sb.inArray(numberArray, 2);
-      chai.assert.isTrue(res);
-    });
-
-    it('Check if not contains number return false', function () {
-      var res = sb.inArray(numberArray, 5);
-      chai.assert.isFalse(res);
-    });
-
-    it('Check if contains string return true', function () {
-      var res = sb.inArray(stringArray, '2');
-      chai.assert.isTrue(res);
-    });
-
-    it('Check if not contains string return false', function () {
-      var res = sb.inArray(stringArray, '5');
-      chai.assert.isFalse(res);
-    });
-  });
-
-  describe('sb.uniqBy()', function () {
-    var objArray = [{"a": 1}, {"a": 2}, {"a": 3}];
-    it('Check is array', function () {
-      var res = sb.uniqBy(objArray, "a");
-      chai.assert.isArray(res);
-    });
-
-    it('Check length is 3', function () {
-      var res = sb.uniqBy(objArray, "a");
-      chai.assert.lengthOf(res, 3);
-    });
-
-    it('Check if all elements is a numbers', function () {
-      var res = sb.uniqBy(objArray, "a");
-      for (var i = 0; i < res.length; i++) {
-        chai.assert.isNumber(res[i]);
+    })
+
+    it('Check if numbers array have a same length', () => {
+      const array = [1,2,3,4,5]
+      const res = sb.shuffle(array)
+      chai.assert.lengthOf(res, array.length)
+    })
+
+    it('Check if contains the same values', () => {
+      const array = [1,2,3,4,5]
+      const res = sb.shuffle(array)
+      array.forEach(value => {
+        chai.expect(res).to.include(value)
+      })
+    })
+
+    it('Check the array is not the same order', () => {
+      const array = [1,2,3,4,5]
+      const res = sb.shuffle(array)
+      chai.assert.notStrictEqual(array, res, 'These array values are not strictly equal')
+    })
+  })
+
+
+  describe('sb.first()', () => {
+    it('Check first element is correct', () => {
+      const array = ['a','b','c']
+      const res = sb.first(array)
+      chai.assert.isString(res)
+      chai.assert.equal(res, 'a')
+    })
+  })
+
+  describe('sb.last()', () => {
+    it('Check if last element is correct', () => {
+      const array = ['a','b','c']
+      const res = sb.last(array)
+      chai.assert.isString(res)
+      chai.assert.equal(res, 'c')
+    })
+  })
+
+  describe('sb.remove()', () => {
+    var objArray = [{"a": 1}, {"a": 2}, {"b": 3}]
+    var numberArray = [1, 2, 6]
+    var stringArray = ["1", "2", "6"]
+
+    it('Delete a number', () => {
+      const res = sb.remove(numberArray, 2)
+      chai.assert.lengthOf(res, 2)
+      chai.assert.isArray(res)
+    })
+
+    it('Delete a multiple numbers', () => {
+      const res = sb.remove(numberArray, [2,6])
+      chai.assert.lengthOf(res, 1)
+      chai.assert.isArray(res)
+    })
+
+    it('Delete a object', () => {
+      const res = sb.remove(objArray, {"b": 3})
+      chai.assert.lengthOf(res, 2)
+      chai.assert.isArray(res)
+    })
+
+    it('Delete multiple objects', () => {
+      const res = sb.remove(objArray, [{"b": 3}, {"a": 1}])
+      chai.assert.lengthOf(res, 1)
+      chai.assert.isArray(res)
+    })
+
+    it('Delete string', () => {
+      const res = sb.remove(stringArray, "2")
+      chai.assert.lengthOf(res, 2)
+      chai.assert.isArray(res)
+    })
+
+    it('Delete multiple string', () => {
+      const res = sb.remove(stringArray, ["6", "2"])
+      chai.assert.lengthOf(res, 1)
+      chai.assert.isArray(res)
+    })
+  })
+
+  describe('sb.clear()', () => {
+    it('Check is a array', () => {
+      var array = [1,2,3]
+      const res = sb.clear(array)
+      chai.assert.isArray(res)
+    })
+
+    it('Check length is 0', () => {
+      var array = [1,2,3]
+      const res = sb.clear(array)
+      chai.assert.lengthOf(res, 0)
+    })
+  })
+
+  describe('sb.inArray()', () => {
+    var numberArray = [1, 2, 3]
+    var stringArray = ['1', '2', '3']
+
+    it('Check if contains number return true', () => {
+      const res = sb.inArray(numberArray, 2)
+      chai.assert.isTrue(res)
+    })
+
+    it('Check if not contains number return false', () => {
+      const res = sb.inArray(numberArray, 5)
+      chai.assert.isFalse(res)
+    })
+
+    it('Check if contains string return true', () => {
+      const res = sb.inArray(stringArray, '2')
+      chai.assert.isTrue(res)
+    })
+
+    it('Check if not contains string return false', () => {
+      const res = sb.inArray(stringArray, '5')
+      chai.assert.isFalse(res)
+    })
+  })
+
+  describe('sb.uniqBy()', () => {
+    var objArray = [{"a": 1}, {"a": 2}, {"a": 3}]
+    it('Check is array', () => {
+      const res = sb.uniqBy(objArray, "a")
+      chai.assert.isArray(res)
+    })
+
+    it('Check length is 3', () => {
+      const res = sb.uniqBy(objArray, "a")
+      chai.assert.lengthOf(res, 3)
+    })
+
+    it('Check if all elements is a numbers', () => {
+      const res = sb.uniqBy(objArray, "a")
+      for (let i = 0; i < res.length; i++) {
+        chai.assert.isNumber(res[i])
       }
-    });
-  });
-
-  describe('sb.uniq()', function () {
-    var objArray = [{"a": 1}, {"a": 2}, {"a": 2}, {"a": 3}];
-    it('Check is array', function () {
-      var res = sb.uniq(objArray);
-      chai.assert.isArray(res);
-    });
-
-    it('Check length is 3', function () {
-      var res = sb.uniq(objArray);
-      chai.assert.lengthOf(res, 3);
-    });
-
-    it('Check if all elements is a numbers', function () {
-      var res = sb.uniq(objArray, "a");
-      for (var i = 0; i < res.length; i++) {
-        chai.assert.isObject(res[i]);
+    })
+  })
+
+  describe('sb.uniq()', () => {
+    var objArray = [{"a": 1}, {"a": 2}, {"a": 2}, {"a": 3}]
+    it('Check is array', () => {
+      const res = sb.uniq(objArray)
+      chai.assert.isArray(res)
+    })
+
+    it('Check length is 3', () => {
+      const res = sb.uniq(objArray)
+      chai.assert.lengthOf(res, 3)
+    })
+
+    it('Check if all elements is a numbers', () => {
+      const res = sb.uniq(objArray, "a")
+      for (let i = 0; i < res.length; i++) {
+        chai.assert.isObject(res[i])
       }
-    });
-  });
-
-  describe('sb.filter()', function () {
-    var array = sb.assign(arraytest);
-
-    it('Check length is 3', function () {
-      var res = sb.filter(array, function (x) {
-        return x.a > 1;
-      });
-      chai.assert.lengthOf(res, 1);
-    });
-  });
-
-  describe('sb.filterBy()', function () {
-    var array = sb.assign(arraytest);
-
-    it('Check it return\'s array', function () {
-      var res = sb.filterBy(array, {"a": 1});
-      chai.assert.isArray(res);
-    });
-
-    it('Return correct number of values', function () {
-      var res = sb.filterBy(array, {"a": 1});
-      res.forEach(function (e) {
-        chai.assert.equal(e.a, 1, "Not correct values");
-      });
-      chai.assert.lengthOf(res, 2);
-    });
-
-    it('Return correct number of values', function () {
-      var res = sb.filterBy(array, {"a": 2});
-      res.forEach(function (e) {
-        chai.assert.equal(e.a, 2, "Not correct values");
-      });
-      chai.assert.lengthOf(res, 1);
-    });
-
-    it('Return correct number of values', function () {
-      var res = sb.filterBy(array, {"a": 3});
-      res.forEach(function (e) {
-        chai.assert.equal(e.a, 3, "Not correct values");
-      });
-
-      chai.assert.lengthOf(res, 0);
-    });
-
-    it('Return correct number of values', function () {
-      var res = sb.filterBy(array, {
+    })
+  })
+
+  describe('sb.filter()', () => {
+    var array = sb.assign(arraytest)
+
+    it('Check length is 3', () => {
+      const res = sb.filter(array, x => {
+        return x.a > 1
+      })
+      chai.assert.lengthOf(res, 1)
+    })
+  })
+
+  describe('sb.filterBy()', () => {
+    var array = sb.assign(arraytest)
+
+    it('Check it return\'s array', () => {
+      const res = sb.filterBy(array, {"a": 1})
+      chai.assert.isArray(res)
+    })
+
+    it('Return correct number of values', () => {
+      const res = sb.filterBy(array, {"a": 1})
+      res.forEach(e => {
+        chai.assert.equal(e.a, 1, "Not correct values")
+      })
+      chai.assert.lengthOf(res, 2)
+    })
+
+    it('Return correct number of values', () => {
+      const res = sb.filterBy(array, {"a": 2})
+      res.forEach(e => {
+        chai.assert.equal(e.a, 2, "Not correct values")
+      })
+      chai.assert.lengthOf(res, 1)
+    })
+
+    it('Return correct number of values', () => {
+      const res = sb.filterBy(array, {"a": 3})
+      res.forEach(e => {
+        chai.assert.equal(e.a, 3, "Not correct values")
+      })
+
+      chai.assert.lengthOf(res, 0)
+    })
+
+    it('Return correct number of values', () => {
+      const res = sb.filterBy(array, {
         "a": 1,
         "b": 3
-      });
+      })
 
-      res.forEach(function (e) {
-        chai.assert.equal(e.a, 1, "Not correct values");
-      });
+      res.forEach(e => {
+        chai.assert.equal(e.a, 1, "Not correct values")
+      })
 
-      res.forEach(function (e) {
-        chai.assert.equal(e.b, 3, "Not correct values");
-      });
+      res.forEach(e => {
+        chai.assert.equal(e.b, 3, "Not correct values")
+      })
 
-      chai.assert.lengthOf(res, 0);
-    });
-  });
-});
+      chai.assert.lengthOf(res, 0)
+    })
+  })
+})
diff --git a/test/generic.test.js b/test/generic.test.js
index ea3355d..2a232d9 100644
--- a/test/generic.test.js
+++ b/test/generic.test.js
@@ -1,50 +1,51 @@
 /*global describe it*/
-var chai = require('chai');
-var sb = require('../src/main');
 
-describe('Generic', function () {
+const chai = require('chai')
+const sb = require('../src/main')
+
+describe('Generic', () => {
   var object = {
     "a": 1,
     "b": 2
-  };
-
-  var array = [1, 2, 3, 4];
-
-  describe('sb.chain()', function () {
-    it('Returns a object', function () {
-      chai.assert.typeOf(sb.chain('test'), 'object');
-    });
-  });
-
-  describe('sb.toString()', function () {
-    it('Return string from object', function () {
-      chai.assert.typeOf(sb.toString(object), 'string');
-    });
-
-    it('Return string from number', function () {
-      chai.assert.typeOf(sb.toString(array), 'string');
-    });
-
-    it('Return string from array', function () {
-      chai.assert.typeOf(sb.toString(5), 'string');
-    });
-
-    it('Return string from string', function () {
-      chai.assert.typeOf(sb.toString("STRING"), 'string');
-    });
-  });
-
-  describe('sb.size()', function () {
-    it('Returns a number', function () {
-      chai.assert.isNumber(sb.size(object));
-    });
-
-    it('Returns a number', function () {
-      chai.assert.isNumber(sb.size(array));
-    });
-
-    it('Returns a number', function () {
-      chai.assert.isNumber(sb.size("string"));
-    });
-  });
-});
+  }
+
+  var array = [1, 2, 3, 4]
+
+  describe('sb.chain()', () => {
+    it('Returns a object', () => {
+      chai.assert.typeOf(sb.chain('test'), 'object')
+    })
+  })
+
+  describe('sb.toString()', () => {
+    it('Return string from object', () => {
+      chai.assert.typeOf(sb.toString(object), 'string')
+    })
+
+    it('Return string from number', () => {
+      chai.assert.typeOf(sb.toString(array), 'string')
+    })
+
+    it('Return string from array', () => {
+      chai.assert.typeOf(sb.toString(5), 'string')
+    })
+
+    it('Return string from string', () => {
+      chai.assert.typeOf(sb.toString("STRING"), 'string')
+    })
+  })
+
+  describe('sb.size()', () => {
+    it('Returns a number', () => {
+      chai.assert.isNumber(sb.size(object))
+    })
+
+    it('Returns a number', () => {
+      chai.assert.isNumber(sb.size(array))
+    })
+
+    it('Returns a number', () => {
+      chai.assert.isNumber(sb.size("string"))
+    })
+  })
+})
diff --git a/test/linter.test.js b/test/linter.test.js
index bab8d07..7c5a3d9 100644
--- a/test/linter.test.js
+++ b/test/linter.test.js
@@ -1,15 +1,9 @@
 /*eslint global-require: 0*/
 /*global require describe */
+const lint = require('mocha-eslint')
 
-describe('Linter Quality Code', function () {
-  if (process.versions.node.split('.')[0]>3) {
-    describe('ESLint: JavaScript Code Quality Tool', function () {
-      var lint = require('mocha-eslint');
-      lint('./src/*', {"no-nested-ternary": false});
-    });
-  }
-
-  describe('JSHint: JavaScript Code Quality Tool', function () {
-    require('mocha-jshint')({"paths": ['./src/']});
-  });
-});
+describe('Linter Quality Code', () => {
+  describe('ESLint: JavaScript Code Quality Tool', () => {
+    lint('./src/*', {"no-nested-ternary": false})
+  })
+})
diff --git a/test/object.test.js b/test/object.test.js
index 925c22f..bd34adb 100644
--- a/test/object.test.js
+++ b/test/object.test.js
@@ -1,149 +1,149 @@
 /*global describe it*/
 
-var chai = require('chai');
-var sb = require('../src/main');
+const chai = require('chai')
+const sb = require('../src/main')
 
-describe('Object', function () {
+describe('Object', () => {
   var object = {
     "a": 1,
     "b": 2
-  };
-
-  describe('sb.assing()', function () {
-    var objCopy = sb.assign(object);
-    it('Return object', function () {
-      chai.assert.isObject(objCopy);
-    });
-
-    it('The same object', function () {
-      chai.assert.notEqual(objCopy, object);
-    });
-
-    it('The same data', function () {
-      chai.assert.notStrictEqual(objCopy, object, "The same values");
-    });
-  });
-
-  describe('sb.clone()', function () {
-    var objCopy = sb.clone(object);
-    it('Return object', function () {
-      chai.assert.isObject(objCopy);
-    });
-
-    it('The same object', function () {
-      chai.assert.notEqual(objCopy, object);
-    });
-
-    it('The same data', function () {
-      chai.assert.notStrictEqual(objCopy, object, "The same values");
-    });
-  });
-
-  describe('sb.get()', function () {
-    var a = {"a": {"b": ["c", "d"]}};
-    it('Check get a string', function () {
-      var res = sb.get(a, "a.b.0");
-      chai.assert.isString(res);
-    });
-
-    it('Check get "c" string', function () {
-      var res = sb.get(a, "a.b.0");
-      chai.assert.equal(res, "c");
-    });
-
-    it('Check get a array', function () {
-      var res = sb.get(a, "a.b");
-      chai.assert.isArray(res);
-    });
-
-    it('Check get a object', function () {
-      var res = sb.get(a, "a");
-      chai.assert.isObject(res);
-    });
-  });
-
-  describe('sb.extend()', function () {
-    var obj = {"a": 1};
-    var obj2 = {"b": 2};
+  }
+
+  describe('sb.assing()', () => {
+    var objCopy = sb.assign(object)
+    it('Return object', () => {
+      chai.assert.isObject(objCopy)
+    })
+
+    it('The same object', () => {
+      chai.assert.notEqual(objCopy, object)
+    })
+
+    it('The same data', () => {
+      chai.assert.notStrictEqual(objCopy, object, "The same values")
+    })
+  })
+
+  describe('sb.clone()', () => {
+    var objCopy = sb.clone(object)
+    it('Return object', () => {
+      chai.assert.isObject(objCopy)
+    })
+
+    it('The same object', () => {
+      chai.assert.notEqual(objCopy, object)
+    })
+
+    it('The same data', () => {
+      chai.assert.notStrictEqual(objCopy, object, "The same values")
+    })
+  })
+
+  describe('sb.get()', () => {
+    var a = {"a": {"b": ["c", "d"]}}
+    it('Check get a string', () => {
+      const res = sb.get(a, "a.b.0")
+      chai.assert.isString(res)
+    })
+
+    it('Check get "c" string', () => {
+      const res = sb.get(a, "a.b.0")
+      chai.assert.equal(res, "c")
+    })
+
+    it('Check get a array', () => {
+      const res = sb.get(a, "a.b")
+      chai.assert.isArray(res)
+    })
+
+    it('Check get a object', () => {
+      const res = sb.get(a, "a")
+      chai.assert.isObject(res)
+    })
+  })
+
+  describe('sb.extend()', () => {
+    var obj = {"a": 1}
+    var obj2 = {"b": 2}
     var objtest = {
       "a": 1,
       "b": 2
-    };
+    }
 
-    var res = sb.extend(obj, obj2);
-    it('Returns object', function () {
-      chai.assert.isObject(res);
-    });
+    const res = sb.extend(obj, obj2)
+    it('Returns object', () => {
+      chai.assert.isObject(res)
+    })
 
-    it('Object is a fusion', function () {
-      chai.assert.notStrictEqual(res, objtest);
-    });
+    it('Object is a fusion', () => {
+      chai.assert.notStrictEqual(res, objtest)
+    })
 
-    it('Attribute \'a\' is equal', function () {
-      chai.assert.equal(res.a, objtest.a);
-    });
+    it('Attribute \'a\' is equal', () => {
+      chai.assert.equal(res.a, objtest.a)
+    })
 
-    it('Attribute \'b\' is equal', function () {
-      chai.assert.equal(res.b, objtest.b);
-    });
-  });
+    it('Attribute \'b\' is equal', () => {
+      chai.assert.equal(res.b, objtest.b)
+    })
+  })
 
-  describe('sb.keys()', function () {
+  describe('sb.keys()', () => {
     var obj = {
       "a": 1,
       "b": 2,
       "c": 3,
       "d": 4
-    };
+    }
     //chai.assert.strictEqual(sb.keys(obj), Object.keys(obj), 'Correct result')
-    chai.assert.isArray(sb.keys(obj), 'is Array');
-    chai.assert.lengthOf(sb.keys(obj), 4, 'Same length');
-  });
+    chai.assert.isArray(sb.keys(obj), 'is Array')
+    chai.assert.lengthOf(sb.keys(obj), 4, 'Same length')
+  })
 
-  describe('sb.getKeys()', function () {
+  describe('sb.getKeys()', () => {
     var obj = {
       "a": 1,
       "b": 2,
       "c": 3,
       "d": 4
-    };
-    var res = sb.getKeys(obj, 'a');
-    var res2 = sb.getKeys(obj, ['b','d']);
+    }
+    const res = sb.getKeys(obj, 'a')
+    const res2 = sb.getKeys(obj, ['b','d'])
 
-    it('Returns object', function () {
-      chai.assert.isObject(res);
-    });
+    it('Returns object', () => {
+      chai.assert.isObject(res)
+    })
 
-    it('Object length', function () {
-      chai.assert.lengthOf(Object.keys(res), 1);
-    });
+    it('Object length', () => {
+      chai.assert.lengthOf(Object.keys(res), 1)
+    })
 
-    it('Validate value', function () {
-      chai.assert.equal(res.a, 1);
-    });
+    it('Validate value', () => {
+      chai.assert.equal(res.a, 1)
+    })
 
-    it('Returns object', function () {
-      chai.assert.isObject(res2);
-    });
+    it('Returns object', () => {
+      chai.assert.isObject(res2)
+    })
 
-    it('Object length', function () {
-      chai.assert.lengthOf(Object.keys(res2), 2);
-    });
+    it('Object length', () => {
+      chai.assert.lengthOf(Object.keys(res2), 2)
+    })
 
-    it('Validate values', function () {
-      chai.assert.equal(res2.b, 2);
-      chai.assert.equal(res2.d, 4);
-    });
-  });
+    it('Validate values', () => {
+      chai.assert.equal(res2.b, 2)
+      chai.assert.equal(res2.d, 4)
+    })
+  })
 
-  describe('sb.merge()', function () {
+  describe('sb.merge()', () => {
     var obj = {
       "a": 1,
       "b": 2,
       "c": 3,
       "d": 4
-    };
-    var res = sb.merge(object, obj);
-    chai.assert.lengthOf(Object.keys(res), 4);
-  });
-});
+    }
+    const res = sb.merge(object, obj)
+    chai.assert.lengthOf(Object.keys(res), 4)
+  })
+})
diff --git a/test/string.test.js b/test/string.test.js
index cb98f24..c9c5941 100644
--- a/test/string.test.js
+++ b/test/string.test.js
@@ -1,39 +1,36 @@
 /*global describe it*/
 
-var chai = require('chai');
-var sb = require('../src/main');
+const chai = require('chai')
+const sb = require('../src/main')
 
-describe('String', function () {
-  describe('sb.toInt()', function () {
-    it('Return number', function () {
-      chai.assert.typeOf(sb.toInt('123'), 'number');
-    });
-  });
+describe('String', () => {
+  describe('sb.toInt()', () => {
+    it('Return number', () => {
+      chai.assert.typeOf(sb.toInt('123'), 'number')
+    })
+  })
 
-  describe('sb.capitalize()', function () {
-    var string = 'abc';
-    var res = sb.capitalize(string);
-    it('Returns a string with same length', function () {
-      chai.assert.lengthOf(res, string.length);
-    });
+  describe('sb.capitalize()', () => {
+    var string = 'abc'
+    const res = sb.capitalize(string)
+    it('Returns a string with same length', () => {
+      chai.assert.lengthOf(res, string.length)
+    })
 
-    it('Returns the same string', function () {
-      chai.assert.equal(res, 'Abc');
-    });
-  });
+    it('Returns the same string', () => {
+      chai.assert.equal(res, 'Abc')
+    })
+  })
 
-  /*
-  describe('sb.dos2unix()', function () {
-    var stringDos = 'hi';
-    var stringUnix = "hi";
+  describe('sb.dos2unix()', () => {
     //Need test
-  });
-  */
-  describe('sb.excerpt()', function () {
+  })
+  
+  describe('sb.excerpt()', () => {
     //Need test
-  });
+  })
 
-  describe('sb.json()', function () {
-    chai.assert.isObject(sb.json('{ "a" : "5" }'), 'Is an object');
-  });
-});
+  describe('sb.json()', () => {
+    chai.assert.isObject(sb.json('{ "a" : "5" }'), 'Is an object')
+  })
+})
diff --git a/test/tools.test.js b/test/tools.test.js
index 6ae53de..128a101 100644
--- a/test/tools.test.js
+++ b/test/tools.test.js
@@ -1,105 +1,105 @@
 /*global describe it*/
 
-var chai = require('chai');
-var sb = require('../src/main');
-
-describe('Tools', function () {
-  describe('sb.range()', function () {
-    it('Return array', function () {
-      chai.assert.typeOf(sb.range(), 'array');
-      chai.assert.lengthOf(sb.range(), 0);
-    });
-
-    it('Return array of numbers: 0, 1000', function () {
-      var res = sb.range(0,1000);
-      chai.assert.typeOf(res, 'array');
-      chai.assert.lengthOf(res, 1001);
-      for (var i = 0; i<res.length; i++) chai.assert.typeOf(res[i], 'number');
-    });
-
-    it('Return array of varers: a, z', function () {
-      var res = sb.range('a','z');
-      chai.assert.typeOf(res, 'array');
-      chai.assert.lengthOf(res, 26);
-      for (var i = 0; i<res.length; i++) chai.assert.typeOf(res[i], 'string');
-    });
-
-    it('Return array of varers: A, Z', function () {
-      var res = sb.range('A','Z');
-      chai.assert.typeOf(res, 'array');
-      chai.assert.lengthOf(res, 26);
-      for (var i = 0; i<res.length; i++) chai.assert.typeOf(res[i], 'string');
-    });
-
-    it('Testing combinations: 1, Z', function () {
-      var res = sb.range(1,'Z');
-      chai.assert.typeOf(res, 'array');
-      chai.assert.lengthOf(res, 0);
-    });
-
-    it('Testing combinations: Z, 1', function () {
-      var res = sb.range('Z',1);
-      chai.assert.typeOf(res, 'array');
-      chai.assert.lengthOf(res, 0);
-    });
-  });
-
-  describe('sb.random()', function () {
-    it('Check if return a number', function () {
-      for (var i = 0; i < 1000; i++) {
-        var res = sb.random(1,i);
-        chai.assert.isNumber(res);
-        res = sb.random(res-1,i);
-        chai.assert.isNumber(res);
+const chai = require('chai')
+const sb = require('../src/main')
+
+describe('Tools', () => {
+  describe('sb.range()', () => {
+    it('Return array', () => {
+      chai.assert.typeOf(sb.range(), 'array')
+      chai.assert.lengthOf(sb.range(), 0)
+    })
+
+    it('Return array of numbers: 0, 1000', () => {
+      const res = sb.range(0,1000)
+      chai.assert.typeOf(res, 'array')
+      chai.assert.lengthOf(res, 1001)
+      for (let i = 0; i < res.length; i++) chai.assert.typeOf(res[i], 'number')
+    })
+
+    it('Return array of varers: a, z', () => {
+      const res = sb.range('a','z')
+      chai.assert.typeOf(res, 'array')
+      chai.assert.lengthOf(res, 26)
+      for (let i = 0; i < res.length; i++) chai.assert.typeOf(res[i], 'string')
+    })
+
+    it('Return array of varers: A, Z', () => {
+      const res = sb.range('A','Z')
+      chai.assert.typeOf(res, 'array')
+      chai.assert.lengthOf(res, 26)
+      for (let i = 0; i < res.length; i++) chai.assert.typeOf(res[i], 'string')
+    })
+
+    it('Testing combinations: 1, Z', () => {
+      const res = sb.range(1,'Z')
+      chai.assert.typeOf(res, 'array')
+      chai.assert.lengthOf(res, 0)
+    })
+
+    it('Testing combinations: Z, 1', () => {
+      const res = sb.range('Z',1)
+      chai.assert.typeOf(res, 'array')
+      chai.assert.lengthOf(res, 0)
+    })
+  })
+
+  describe('sb.random()', () => {
+    it('Check if return a number', () => {
+      for (let i = 0; i < 1000; i++) {
+        var res = sb.random(1,i)
+        chai.assert.isNumber(res)
+        res = sb.random(res-1,i)
+        chai.assert.isNumber(res)
       }
-    });
-
-    it('Check if array return a number', function () {
-      var arr = [];
-      for (var i = 0; i < 1000; i++) {
-        arr.push(i);
-        var res = sb.random(arr);
-        chai.assert.isNumber(res);
+    })
+
+    it('Check if array return a number', () => {
+      var arr = []
+      for (let i = 0; i < 1000; i++) {
+        arr.push(i)
+        const res = sb.random(arr)
+        chai.assert.isNumber(res)
       }
-    });
-
-    it('Check invalid parameters', function () {
-      var res = sb.random('a');
-      chai.assert.equal(res, 0, 'When fail returns 0');
-      chai.assert.isNumber(res);
-    });
-  });
-
-  describe('sb.ifElse()', function () {
-    it('Check if true returns a true a function', function () {
-      var valtrue = sb.ifElse(true, function () {
-        return true;
+    })
+
+    it('Check invalid parameters', () => {
+      const res = sb.random('a')
+      chai.assert.equal(res, 0, 'When fail returns 0')
+      chai.assert.isNumber(res)
+    })
+  })
+
+  describe('sb.ifElse()', () => {
+    it('Check if true returns a true a function', () => {
+      const valtrue = sb.ifElse(true, () => {
+        return true
       },
-      function () {
-        return false;
-      });
+      () => {
+        return false
+      })
 
-      chai.assert.isTrue(valtrue);
-    });
+      chai.assert.isTrue(valtrue)
+    })
 
-    it('Check if false returns a false a function', function () {
-      var valfalse = sb.ifElse(false, function () {
-        return true;
+    it('Check if false returns a false a function', () => {
+      const valfalse = sb.ifElse(false, () => {
+        return true
       },
-      function () {
-        return false;
-      });
-
-      chai.assert.isFalse(valfalse);
-    });
-
-    it('Check if false returns a false a function', function () {
-      var valfunc = sb.function("hello", function (data) {
-        return data + " test";
-      });
-
-      chai.assert.isString(valfunc);
-      chai.assert.equal(valfunc, "hello test");
-    });
-  });
-});
+      () => {
+        return false
+      })
+
+      chai.assert.isFalse(valfalse)
+    })
+
+    it('Check if false returns a false a function', () => {
+      const valfunc = sb.function("hello", function (data) {
+        return data + " test"
+      })
+
+      chai.assert.isString(valfunc)
+      chai.assert.equal(valfunc, "hello test")
+    })
+  })
+})
diff --git a/webpack.config.js b/webpack.config.js
index a42d7b9..45a6776 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -1,11 +1,22 @@
-var path = require('path');
+const path = require('path')
 
 module.exports = {
-  "entry": "./src/main.js",
-  "output": {
-    "path": path.resolve("./"),
-    "library": "sb",
-    "filename": "spellbook.js",
-    "libraryTarget": "umd"
+  entry: './src/main.js',
+  output: {
+    path: path.resolve("./"),
+    library: "sb",
+    filename: 'spellbook.js',
+    libraryTarget: "umd"
+  },
+  module: {
+    loaders: [
+      {
+        test: /\.js$/,
+        loader: 'babel-loader',
+        query: {
+          presets: ['es2015']
+        }
+      }
+    ]
   }
-};
+}