diff --git a/.editorconfig b/.editorconfig
index d152092..a298b2a 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -7,3 +7,6 @@ charset = utf-8
 trim_trailing_whitespace = true
 insert_final_newline = true
 indent_size = 4
+
+[{*.html,package.json,.travis.yml}]
+indent_size = 2
diff --git a/.eslintrc.js b/.eslintrc.js
new file mode 100644
index 0000000..50c653b
--- /dev/null
+++ b/.eslintrc.js
@@ -0,0 +1,280 @@
+module.exports = {
+    "env": {
+        "browser": true,
+        "commonjs": true,
+        "amd": true
+    },
+    "extends": "eslint:recommended",
+    "rules": {
+        "accessor-pairs": "error",
+        "array-bracket-newline": "error",
+        "array-bracket-spacing": [
+            "error",
+            "never"
+        ],
+        "array-callback-return": "error",
+        "array-element-newline": "off",
+        "arrow-body-style": "error",
+        "arrow-parens": "error",
+        "arrow-spacing": "error",
+        "block-scoped-var": "error",
+        "block-spacing": "error",
+        "brace-style": "off",
+        "callback-return": "error",
+        "camelcase": "off",
+        "capitalized-comments": [
+            "error",
+            "never"
+        ],
+        "class-methods-use-this": "error",
+        "comma-dangle": "error",
+        "comma-spacing": [
+            "error",
+            {
+                "after": true,
+                "before": false
+            }
+        ],
+        "comma-style": [
+            "error",
+            "last"
+        ],
+        "complexity": "error",
+        "computed-property-spacing": [
+            "error",
+            "never"
+        ],
+        "consistent-return": "error",
+        "consistent-this": "error",
+        "curly": "error",
+        "default-case": "error",
+        "dot-location": "error",
+        "dot-notation": "error",
+        "eol-last": "error",
+        "eqeqeq": "error",
+        "for-direction": "error",
+        "func-call-spacing": "error",
+        "func-name-matching": "error",
+        "func-names": [
+            "error",
+            "never"
+        ],
+        "func-style": [
+            "error",
+            "expression"
+        ],
+        "function-paren-newline": "error",
+        "generator-star-spacing": "error",
+        "getter-return": "error",
+        "global-require": "off",
+        "guard-for-in": "error",
+        "handle-callback-err": "error",
+        "id-blacklist": "error",
+        "id-length": "off",
+        "id-match": "error",
+        "indent": "error",
+        "indent-legacy": "error",
+        "init-declarations": "error",
+        "jsx-quotes": "error",
+        "key-spacing": "error",
+        "keyword-spacing": [
+            "error",
+            {
+                "after": true,
+                "before": true
+            }
+        ],
+        "line-comment-position": "off",
+        "linebreak-style": [
+            "error",
+            "unix"
+        ],
+        "lines-around-comment": "error",
+        "lines-around-directive": "off",
+        "max-depth": "error",
+        "max-len": "off",
+        "max-lines": "error",
+        "max-nested-callbacks": "error",
+        "max-params": "error",
+        "max-statements": "off",
+        "max-statements-per-line": "error",
+        "multiline-ternary": [
+            "error",
+            "never"
+        ],
+        "new-cap": "error",
+        "new-parens": "error",
+        "newline-after-var": "off",
+        "newline-before-return": "error",
+        "newline-per-chained-call": "off",
+        "no-alert": "error",
+        "no-array-constructor": "error",
+        "no-await-in-loop": "error",
+        "no-bitwise": "error",
+        "no-buffer-constructor": "error",
+        "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": "error",
+        "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-coercion": "error",
+        "no-implicit-globals": "error",
+        "no-implied-eval": "error",
+        "no-inline-comments": "off",
+        "no-invalid-this": "off",
+        "no-iterator": "error",
+        "no-label-var": "error",
+        "no-labels": "error",
+        "no-lone-blocks": "error",
+        "no-lonely-if": "error",
+        "no-loop-func": "error",
+        "no-magic-numbers": "off",
+        "no-mixed-operators": "error",
+        "no-mixed-requires": "error",
+        "no-multi-assign": "error",
+        "no-multi-spaces": "error",
+        "no-multi-str": "error",
+        "no-multiple-empty-lines": "error",
+        "no-native-reassign": "error",
+        "no-negated-condition": "off",
+        "no-negated-in-lhs": "error",
+        "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": "error",
+        "no-path-concat": "error",
+        "no-plusplus": "error",
+        "no-process-env": "error",
+        "no-process-exit": "error",
+        "no-proto": "error",
+        "no-prototype-builtins": "error",
+        "no-restricted-globals": "error",
+        "no-restricted-imports": "error",
+        "no-restricted-modules": "error",
+        "no-restricted-properties": "error",
+        "no-restricted-syntax": "error",
+        "no-return-assign": "error",
+        "no-return-await": "error",
+        "no-script-url": "error",
+        "no-self-compare": "error",
+        "no-sequences": "error",
+        "no-shadow": "error",
+        "no-shadow-restricted-names": "error",
+        "no-spaced-func": "error",
+        "no-sync": "error",
+        "no-tabs": "error",
+        "no-template-curly-in-string": "error",
+        "no-ternary": "off",
+        "no-throw-literal": "error",
+        "no-trailing-spaces": "error",
+        "no-undef-init": "error",
+        "no-undefined": "error",
+        "no-underscore-dangle": "error",
+        "no-unmodified-loop-condition": "error",
+        "no-unneeded-ternary": "error",
+        "no-unused-expressions": "error",
+        "no-use-before-define": "error",
+        "no-useless-call": "error",
+        "no-useless-computed-key": "error",
+        "no-useless-concat": "error",
+        "no-useless-constructor": "error",
+        "no-useless-rename": "error",
+        "no-useless-return": "error",
+        "no-var": "off",
+        "no-void": "error",
+        "no-warning-comments": "error",
+        "no-whitespace-before-property": "error",
+        "no-with": "error",
+        "nonblock-statement-body-position": "error",
+        "object-curly-newline": "off",
+        "object-curly-spacing": "error",
+        "object-property-newline": "error",
+        "object-shorthand": "error",
+        "one-var": "off",
+        "one-var-declaration-per-line": "error",
+        "operator-assignment": "error",
+        "operator-linebreak": "error",
+        "padded-blocks": "off",
+        "padding-line-between-statements": "error",
+        "prefer-arrow-callback": "off",
+        "prefer-const": "error",
+        "prefer-destructuring": "error",
+        "prefer-numeric-literals": "error",
+        "prefer-promise-reject-errors": "error",
+        "prefer-reflect": "error",
+        "prefer-rest-params": "error",
+        "prefer-spread": "error",
+        "prefer-template": "off",
+        "quote-props": "off",
+        "quotes": [
+            "error",
+            "single"
+        ],
+        "radix": "error",
+        "require-await": "error",
+        "require-jsdoc": "error",
+        "rest-spread-spacing": "error",
+        "semi": "error",
+        "semi-spacing": "error",
+        "semi-style": [
+            "error",
+            "last"
+        ],
+        "sort-imports": "error",
+        "sort-keys": "off",
+        "sort-vars": "error",
+        "space-before-blocks": "error",
+        "space-before-function-paren": "off",
+        "space-in-parens": [
+            "error",
+            "never"
+        ],
+        "space-infix-ops": "error",
+        "space-unary-ops": [
+            "error",
+            {
+                "nonwords": false,
+                "words": false
+            }
+        ],
+        "spaced-comment": [
+            "error",
+            "always"
+        ],
+        "strict": [
+            "error",
+            "function"
+        ],
+        "switch-colon-spacing": "error",
+        "symbol-description": "error",
+        "template-curly-spacing": "error",
+        "template-tag-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"
+        ]
+    }
+};
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..3c3629e
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+node_modules
diff --git a/.jscsrc b/.jscsrc
deleted file mode 100644
index ea5be1d..0000000
--- a/.jscsrc
+++ /dev/null
@@ -1,66 +0,0 @@
-{
-  "disallowEmptyBlocks": true,
-  "disallowImplicitTypeConversion": ["binary", "string"],
-  "disallowKeywords": ["eval"],
-  "disallowMixedSpacesAndTabs": true,
-  "disallowMultipleLineStrings": true,
-  "disallowNewlineBeforeBlockStatements": true,
-  "disallowOperatorBeforeLineBreak": ["."],
-  "disallowPaddingNewlinesBeforeKeywords": ["catch"],
-  "disallowPaddingNewlinesInBlocks": true,
-  "disallowSpaceAfterPrefixUnaryOperators": true,
-  "disallowSpaceBeforeComma": true,
-  "disallowSpaceBeforePostfixUnaryOperators": true,
-  "disallowSpacesInCallExpression": true,
-  "disallowSpacesInFunctionDeclaration": {
-    "beforeOpeningRoundBrace": true
-  },
-  "disallowSpacesInNamedFunctionExpression": {
-    "beforeOpeningRoundBrace": true
-  },
-  "disallowSpacesInsideParentheses": true,
-  "disallowSpacesInsideParenthesizedExpression": true,
-  "disallowTrailingComma": true,
-  "disallowTrailingWhitespace": true,
-  "disallowYodaConditions": true,
-
-  "requireBlocksOnNewline": 1,
-  "requireCapitalizedConstructors": true,
-  "requireCamelCaseOrUpperCaseIdentifiers": true,
-  "requireCommaBeforeLineBreak": true,
-  "requireCurlyBraces": true,
-  "requireKeywordsOnNewLine": ["for", "while"],
-  "requireLineFeedAtFileEnd": true,
-  "requireOperatorBeforeLineBreak": [
-    "?", ":", "=", "+", "-", "/", "*", "==", "===",
-    "!=","!==", ">", ">=", "<", "<=", "&&", "||"
-  ],
-  "requirePaddingNewLinesAfterUseStrict": true,
-  "requireParenthesesAroundIIFE": true,
-  "requireSemicolons": true,
-  "requireSpaceAfterBinaryOperators": true,
-  "requireSpaceAfterKeywords": true,
-  "requireSpaceBeforeBinaryOperators": true,
-  "requireSpaceBeforeBlockStatements": true,
-  "requireSpaceBeforeObjectValues": true,
-  "requireSpaceBetweenArguments": true,
-  "requireSpacesInConditionalExpression": true,
-  "requireSpacesInFunction": {
-    "beforeOpeningCurlyBrace": true
-  },
-  "requireSpacesInAnonymousFunctionExpression" : {
-    "beforeOpeningRoundBrace": true,
-    "beforeOpeningCurlyBrace": true
-  },
-  "requireSpacesInForStatement": true,
-
-  "validateIndentation": 2,
-  "validateLineBreaks": "LF",
-  "validateQuoteMarks": "'",
-
-  "disallowNodeTypes": [
-    "EmptyStatement",
-    "SwitchStatement",
-    "WithStatement"
-  ]
-}
diff --git a/.jshintrc b/.jshintrc
deleted file mode 100644
index 7d8f49b..0000000
--- a/.jshintrc
+++ /dev/null
@@ -1,29 +0,0 @@
-{
-  "globals": {},
-
-  "browser"     : true,
-  "browserify"  : true,
-  "module"      : true,
-
-  "esversion"   : 6,
-  "strict"      : "global",
-  "latedef"     : true,
-  "undef"       : true,
-  "bitwise"     : true,
-  "curly"       : true,
-  "eqeqeq"      : true,
-  "eqnull"      : true,
-  "unused"      : true,
-  "noarg"       : true,
-  "trailing"    : true,
-  "nonbsp"      : true,
-  "forin"       : true,
-  "iterator"    : true,
-  "nocomma"     : true,
-  "nonew"       : true,
-  "notypeof"    : true,
-  "shadow"      : false,
-  "singleGroups": true,
-  "lastsemic"   : true,
-  "plusplus"    : true
-}
diff --git a/.npmignore b/.npmignore
new file mode 100644
index 0000000..0d0d247
--- /dev/null
+++ b/.npmignore
@@ -0,0 +1,6 @@
+.editorconfig
+.travis.yml
+.eslint.js
+bower.json
+*-legacy.js
+docs
diff --git a/.travis.yml b/.travis.yml
new file mode 100644
index 0000000..58b2563
--- /dev/null
+++ b/.travis.yml
@@ -0,0 +1,4 @@
+language: node_js
+node_js:
+  - "6.10"
+  - "stable"
diff --git a/bower.json b/bower.json
index 9b5d33c..0ede0b3 100644
--- a/bower.json
+++ b/bower.json
@@ -1,8 +1,8 @@
 {
   "title": "jQuery Accessible Accordion system, using ARIA",
   "name": "jquery-accessible-accordion-aria",
-  "version": "2.4.4",
-  "main": "jquery-accessible-accordion-aria.js",
+  "version": "2.4.5",
+  "main": "index.js",
   "description": "This jQuery plugin will provide you an accessible Accordion System, using ARIA",
   "author": [
     {
@@ -26,7 +26,5 @@
   ],
   "dependencies": {
     "jquery": ">=1.0.0"
-  },
-  "devDependencies": {
   }
 }
diff --git a/docs/sample-nested.html b/docs/sample-nested.html
new file mode 100644
index 0000000..cbc93da
--- /dev/null
+++ b/docs/sample-nested.html
@@ -0,0 +1,101 @@
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<head>
+<title>Accordion example</title>
+<meta charset="utf-8" />
+<meta name="author" content="Nicolas Hoffmann" />
+<link rel="apple-touch-icon" href="/apple-touch-icon.png" />
+<meta name="viewport" content="width=device-width" />
+<link rel="stylesheet" href="http://rocssti.net/downloads/rocssti-fr.css" />
+
+<script src="http://code.jquery.com/jquery-1.11.2.min.js"></script>
+<script src="../index.js"></script>
+
+<script>
+$(function() {
+  $('.js-accordion').accordion({
+     headersSelector: '> .js-accordion__header', // relative to panel
+     panelsSelector: '> .js-accordion__panel', // relative to wrapper
+     buttonsSelector: '> button.js-accordion__header' // relative to wrapper
+  });
+});
+</script>
+
+<style>
+.js-accordion__panel[aria-hidden=true] {
+  display: none;
+}
+
+.js-accordion__panel[role="tabpanel"] .js-accordion__header {
+  display: none;
+}
+
+.js-accordion__panel {
+  padding-left: 2em;
+}
+
+button.js-accordion__header {
+  display: block !important;
+}
+
+.js-accordion__header[aria-expanded="true"]:before {
+  content: "- ";
+}
+.js-accordion__header[aria-expanded="false"]:before {
+  content: "+ ";
+}
+
+.js-accordion__header[aria-selected="true"]:after {
+  content: " (selected)";
+}
+.js-accordion__header[aria-selected="false"]:after {
+  content: " (unselected)";
+}
+
+#page {
+  width: 960px;
+}
+</style>
+</head>
+<body role="document">
+<div id="page">
+  <h1>Example of nested accordions</h1>
+
+  <div class="js-accordion" id="accordion1" data-accordion-prefix-classes="minimalist-accordion">
+    <div class="js-accordion__panel">
+        <h2 class="js-accordion__header">First tab</h2>
+        <p>Content of 1st tab</p>
+    </div>
+    <div class="js-accordion__panel">
+      <h2 class="js-accordion__header">Second tab</h2>
+      <p>Content of 2nd tab</p>
+
+      <div class="js-accordion" id="accordion_inner" data-accordion-prefix-classes="minimalist-accordion">
+          <div class="js-accordion__panel">
+              <h3 class="js-accordion__header">First tab</h3>
+              <p>Content of 1st tab</p>
+          </div>
+          <div class="js-accordion__panel">
+              <h2 class="js-accordion__header">Second tab</h2>
+              <p>Content of 2nd tab</p>
+          </div>
+          <div class="js-accordion__panel">
+              <h2 class="js-accordion__header">Third tab</h2>
+              <p>Content of 3rd tab</p>
+          </div>
+      </div>
+    </div>
+    <div class="js-accordion__panel">
+        <h2 class="js-accordion__header">Third tab</h2>
+        <p>Content of 3rd tab</p>
+    </div>
+  </div>
+
+  <br><br><br>
+  <a href="http://www.w3.org/TR/wai-aria-practices/#accordion">Design pattern</a>
+  <br><br>
+  <a href="http://a11y.nicolas-hoffmann.net/accordion/">jQuery Accessible tab panel system, using ARIA</a>
+
+</div>
+</body>
+</html>
diff --git a/docs/sample.html b/docs/sample.html
index 6643a67..e9ea35e 100644
--- a/docs/sample.html
+++ b/docs/sample.html
@@ -8,9 +8,8 @@
 <meta name="viewport" content="width=device-width" />
 <link rel="stylesheet" href="http://rocssti.net/downloads/rocssti-fr.css" />
 
-
 <script src="http://code.jquery.com/jquery-1.11.2.min.js"></script>
-<script src="../jquery-accessible-accordion-aria.js"></script>
+<script src="../index.js"></script>
 
 <script>
   $(function () {
@@ -28,7 +27,7 @@
 }
 
 button.js-accordion__header {
-  display: block;
+  display: block !important;
 }
 
 .js-accordion__header[aria-expanded="true"]:before {
diff --git a/jquery-accessible-accordion-aria.js b/index.js
similarity index 90%
rename from jquery-accessible-accordion-aria.js
rename to index.js
index eb065b0..90209c2 100644
--- a/jquery-accessible-accordion-aria.js
+++ b/index.js
@@ -1,6 +1,6 @@
 /*
  * jQuery Accessible Accordion system, using ARIA
- * @version v2.4.4 
+ * @version v2.4.4
  * Website: https://a11y.nicolas-hoffmann.net/accordion/
  * License MIT: https://github.com/nico3333fr/jquery-accessible-accordion-aria/blob/master/LICENSE
  */
@@ -11,7 +11,7 @@
     } else if (typeof exports !== 'undefined') {
         module.exports = factory(require('jquery'));
     } else {
-        factory(jQuery);
+        factory(window.jQuery);
     }
 }(function($) {
     'use strict';
@@ -52,14 +52,10 @@
         }).addClass(this.options.prefixClass);
 
         // id generated if not present
-        this.$wrapper.each($.proxy(function(index, el) {
-            var $wrapper = $(el);
+        if (!this.$wrapper.attr('id')) {
             var index_lisible = Math.random().toString(32).slice(2, 12);
-
-            if (!$wrapper.attr('id')) {
-                $wrapper.attr('id', this.options.accordionPrefixId + '-' + index_lisible);
-            }
-        }, this));
+            this.attr('id', this.options.accordionPrefixId + '-' + index_lisible);
+        }
 
         this.$panels.each($.proxy(function(index, el) {
             var $panel = $(el);
@@ -169,8 +165,7 @@
         var $button = $target.is('button') ? $target : $target.closest('button');
         var $firstButton = this.$buttons.first();
         var $lastButton = this.$buttons.last();
-        var $prevButton = $button.prevAll(this.options.buttonsSelector).first();
-        var $nextButton = $button.nextAll(this.options.buttonsSelector).first();
+        var index = this.$buttons.index($button);
 
         $target = null;
 
@@ -205,12 +200,12 @@
             // strike up or left in the tab => previous tab
             else if ($.inArray(e.keyCode, k.prev) >= 0) {
                 // if we are on first one, activate last
-                $target = $button.is($firstButton) ? $lastButton : $prevButton;
+                $target = $button.is($firstButton) ? $lastButton : this.$buttons.eq(index - 1);
             }
             // strike down or right in the tab => next tab
             else if ($.inArray(e.keyCode, k.next) >= 0) {
                 // if we are on last one, activate first
-                $target = $button.is($lastButton) ? $firstButton : $nextButton;
+                $target = $button.is($lastButton) ? $firstButton : this.$buttons.eq(index + 1);
             }
 
             if ($target !== null) {
@@ -224,10 +219,9 @@
     Accordion.prototype.keydownPanelEventHandler = function(e) {
         var $panel = $(e.target).closest(this.options.panelsSelector);
         var $button = $('#' + $panel.attr('aria-labelledby'));
-        var $firstButton = this.$wrapper.find(this.options.buttonsSelector).first();
-        var $lastButton = this.$wrapper.find(this.options.buttonsSelector).last();
-        var $prevButton = $button.prevAll(this.options.buttonsSelector).first();
-        var $nextButton = $button.nextAll(this.options.buttonsSelector).first();
+        var $firstButton = this.$buttons.first();
+        var $lastButton = this.$buttons.last();
+        var index = this.$buttons.index($button);
         var $target = null;
 
         // strike up + ctrl => go to header
@@ -236,11 +230,11 @@
         }
         // strike pageup + ctrl => go to prev header
         else if (e.keyCode === 33 && e.ctrlKey) {
-            $target = $button.is($firstButton) ? $lastButton : $prevButton;
+            $target = $button.is($firstButton) ? $lastButton : this.$buttons.eq(index - 1);
         }
         // strike pagedown + ctrl => go to next header
         else if (e.keyCode === 34 && e.ctrlKey) {
-            $target = $button.is($lastButton) ? $firstButton : $nextButton;
+            $target = $button.is($lastButton) ? $firstButton : this.$buttons.eq(index + 1);
         }
 
         if ($target !== null) {
diff --git a/jquery-accessible-accordion-aria-legacy-1.2.0.js b/jquery-accessible-accordion-aria-legacy-1.2.0.js
deleted file mode 100644
index 5d88dfc..0000000
--- a/jquery-accessible-accordion-aria-legacy-1.2.0.js
+++ /dev/null
@@ -1,225 +0,0 @@
-$(document).ready(function(){
-
-       /*
-        * jQuery Accessible Accordion system, using ARIA
-        * Website: http://a11y.nicolas-hoffmann.net/accordion/
-        * License MIT: https://github.com/nico3333fr/jquery-accessible-accordion-aria/blob/master/LICENSE
-        */
-        var $accordions = $( ".js-accordion" );
-        if ( $accordions.length  ) { // if there are at least one :)
-           
-           // init 
-           $accordions.each( function( index ) {
-                var $this = $( this );
-                    $options = $this.data(),
-                    $accordions_headers = $this.children( ".js-accordion__header" ),
-                    $accordions_prefix_classes = $options.accordionPrefixClasses || '',
-                    $accordions_multiselectable = $options.accordionMultiselectable || '',
-                    $index_accordion = index+1 ;
-                    
-                $this.attr({
-                      "role": "tablist",
-                      "aria-multiselectable": "true",
-                      "class": $accordions_prefix_classes
-                });
-                
-                // multiselectable or not
-                if ($accordions_multiselectable === "none") {
-                   $this.attr( "aria-multiselectable", "false" );
-                   }
-                
-                $accordions_headers.each( function( index_h ) {
-                      var $that = $( this ),
-                          $text = $that.text(),
-                          $accordion_panel = $that.next( ".js-accordion__panel" ),
-                          $index_header = index_h+1 ;
-                      
-                      $accordion_panel.prepend( $that.removeClass( "js-accordion__header" ).addClass( $accordions_prefix_classes + "__title" ).attr( "tabindex", "0") );
-                          
-                      $accordion_header = $( '<button class="js-accordion__header ' + $accordions_prefix_classes + '__header">' + $text + '</button>' );
-                      $accordion_panel.before( $accordion_header ); 
-                          
-                      $accordion_header.attr({
-                            "aria-controls": "accordion" + $index_accordion + "_panel" + $index_header,
-                            "aria-expanded": "false",
-                            "role": "tab",
-                            "id": "accordion" + $index_accordion + "_tab" + $index_header,
-                            "tabindex": "-1",
-                            "aria-selected": "false"
-                      });
-                      $accordion_panel.attr({
-                            "aria-labelledby": "accordion" + $index_accordion + "_tab" + $index_header,
-                            "role": "tabpanel",
-                            "id": "accordion" + $index_accordion + "_panel" + $index_header,
-                            "aria-hidden": "true"
-                      }).addClass( $accordions_prefix_classes + "__panel" );
-                      
-                      // if opened by default
-                      if ( $that.attr( "data-accordion-opened" ) == "true" ) {
-                         $accordion_header.attr( "aria-expanded", "true" ).removeAttr( "data-accordion-opened" );
-                         $accordion_panel.attr( "aria-hidden", "false" );
-                         }
-          					  
-                      // init first one focusable
-                      if ( $index_header === 1 ) {
-                         $accordion_header.removeAttr( "tabindex" );
-                         }
-                
-                });                
-           });
-           
-           /* Events ---------------------------------------------------------------------------------------------------------- */
-           /* click on a tab link */
-           $( "body" ).on( "focus", ".js-accordion__header", function( event ) {
-                var $this = $( this ),
-                    $accordion = $this.parent(),
-                    $all_accordion_headers = $accordion.find( ".js-accordion__header" );
-                    
-                // selected
-                $all_accordion_headers.attr({
-                      "tabindex": "-1",
-                      "aria-selected": "false"
-                });
-                $this.attr( "aria-selected", "true" ).removeAttr( "tabindex" );
-                
-           })
-           .on( "click", ".js-accordion__header", function( event ) {
-                var $this = $( this ),
-                    $this_panel = $( "#" + $this.attr("aria-controls" )),
-                    $accordion = $this.parent(),
-                    $accordion_multiselectable = $accordion.attr( "aria-multiselectable" ),
-                    $all_accordion_headers = $accordion.find( ".js-accordion__header" ),
-                    $all_accordion_panels = $accordion.find( ".js-accordion__panel" );
-                
-                $all_accordion_headers.attr( "aria-selected", "false" );
-                $this.attr( "aria-selected", "true" );
-                    
-                // opened or closed?
-                if ( $this.attr( "aria-expanded" ) == "false" ) { // closed
-                    $this.attr( "aria-expanded", "true" );
-                    $this_panel.attr( "aria-hidden", "false" );
-                    }
-                    else { // opened
-                           $this.attr( "aria-expanded", "false" );
-                           $this_panel.attr( "aria-hidden", "true" );
-                          }
-                          
-                if ( $accordion_multiselectable == "false" ){
-                   $all_accordion_panels.not( $this_panel ).attr( "aria-hidden", "true" );
-                   $all_accordion_headers.not( $this ).attr( "aria-expanded", "false" );
-                   }
-                          
-                setTimeout(function(){ $this.focus(); }, 0);
-                event.preventDefault();
-                
-           })
-           .on( "keydown", ".js-accordion__header", function( event ) {
-               var $this = $( this ),
-                   $accordion = $this.parent(),
-                   $all_accordion_headers = $accordion.find( ".js-accordion__header" ),
-                   $first_header = $accordion.find( ".js-accordion__header" ).first(),
-                   $last_header = $accordion.find( ".js-accordion__header" ).last(),
-                   $prev_header = $this.prevAll( ".js-accordion__header" ).first(),
-                   $next_header = $this.nextAll( ".js-accordion__header" ).first();
-                    
-               // strike up or left in the tab => previous tab
-               if ( ( event.keyCode == 37 || event.keyCode == 38 ) && !event.ctrlKey ) {
-                   $all_accordion_headers.attr({
-                         "tabindex": "-1",
-                         "aria-selected": "false"
-                   });
-                   // if we are on first one, activate last
-                   if ( $this.is( $first_header ) ) {
-                      $last_header.attr( "aria-selected", "true" ).removeAttr( "tabindex" );
-                      setTimeout(function(){ $last_header.focus(); }, 0);
-                      }
-                      // else activate previous
-                      else {
-                            $prev_header.attr( "aria-selected", "true" ).removeAttr( "tabindex" );
-                            setTimeout(function(){ $prev_header.focus(); }, 0);
-                           }
-                   event.preventDefault();
-               }
-               // strike down or right in the tab => next tab
-               else if ( ( event.keyCode == 40 || event.keyCode == 39 ) && !event.ctrlKey ) {
-                       $all_accordion_headers.attr({
-                             "tabindex": "-1",
-                             "aria-selected": "false"
-                       });
-                       // if we are on last one, activate first
-                       if ( $this.is( $last_header ) ) {
-                           $first_header.attr( "aria-selected", "true" ).removeAttr( "tabindex" );
-                           setTimeout(function(){ $first_header.focus(); }, 0);
-                          }
-                          // else activate next
-                          else {
-                                $next_header.attr( "aria-selected", "true" ).removeAttr( "tabindex" );
-                                setTimeout(function(){ $next_header.focus(); }, 0);
-                                }
-                       event.preventDefault();
-               }
-               // strike home in the tab => 1st tab
-               else if ( event.keyCode == 36 ) {
-                       $all_accordion_headers.attr({
-                             "tabindex": "-1",
-                             "aria-selected": "false"
-                       });
-                       $first_header.attr( "aria-selected", "true" ).removeAttr( "tabindex" );
-                       setTimeout(function(){ $first_header.focus(); }, 0);
-                       event.preventDefault();
-               }
-               // strike end in the tab => last tab
-               else if ( event.keyCode == 35 ) {
-                       $all_accordion_headers.attr({
-                             "tabindex": "-1",
-                             "aria-selected": "false"
-                       });
-                       $last_header.attr( "aria-selected", "true" ).removeAttr( "tabindex" );
-                       setTimeout(function(){ $last_header.focus(); }, 0);
-                       event.preventDefault();
-               }
-           })
-           .on( "keydown", ".js-accordion__panel", function( event ) {
-               var $this = $( this ),
-                   $this_header = $( "#" + $this.attr("aria-labelledby" )),
-                   $accordion = $this.parent( ),
-                   $first_header = $accordion.find( ".js-accordion__header" ).first(),
-                   $prev_header = $this_header.prevAll( ".js-accordion__header" ).first(),
-                   $next_header = $this_header.nextAll( ".js-accordion__header" ).first(),
-                   $last_header = $accordion.find( ".js-accordion__header" ).last();
-                   
-               // strike up + ctrl => go to header
-               if ( event.keyCode == 38 && event.ctrlKey ) {
-                   setTimeout(function(){ $this_header.focus(); }, 0);
-                   event.preventDefault();
-               }
-               // strike pageup + ctrl => go to prev header
-               else if ( event.keyCode == 33 && event.ctrlKey ) {
-                       if ( $this_header.is( $first_header ) ) {
-                           setTimeout(function(){ $last_header.focus(); }, 0);
-                           event.preventDefault();
-                       }
-                       else {
-                             setTimeout(function(){ $prev_header.focus(); }, 0);
-                             event.preventDefault();
-                            }
-               }
-               // strike pagedown + ctrl => go to next header
-               else if ( event.keyCode == 34 && event.ctrlKey ) {
-                       if ( $this_header.is( $last_header ) ) {
-                           setTimeout(function(){ $first_header.focus(); }, 0);
-                           event.preventDefault();
-                       }
-                       else {
-                             setTimeout(function(){ $next_header.focus(); }, 0);
-                             event.preventDefault();
-                            }
-               }
-               
-           });
-        
-        
-        }
- 
-  
-});
diff --git a/package.json b/package.json
index 2c56abf..f42a126 100644
--- a/package.json
+++ b/package.json
@@ -2,8 +2,18 @@
   "title": "jQuery Accessible Accordion system, using ARIA",
   "name": "jquery-accessible-accordion-aria",
   "description": "This jQuery plugin will provide you an accessible Accordion System, using ARIA",
-  "version": "2.4.4",
-  "main": "jquery-accessible-accordion-aria.js",
+  "version": "2.4.5",
+  "main": "index.js",
+  "homepage": "https://a11y.nicolas-hoffmann.net/accordion/",
+  "bugs": {
+    "web": "https://github.com/nico3333fr/jquery-accessible-accordion-aria/issues"
+  },
+  "repositories": [
+    {
+      "type": "git",
+      "url": "https://github.com/nico3333fr/jquery-accessible-accordion-aria.git"
+    }
+  ],
   "keywords": [
     "Accessibility",
     "ARIA",
@@ -11,6 +21,12 @@
     "a11y",
     "jQuery Plugin"
   ],
+  "licenses": [
+    {
+      "name": "MIT",
+      "url": "https://github.com/nico3333fr/jquery-accessible-accordion-aria/blob/master/LICENSE"
+    }
+  ],
   "author": [
     {
       "name": "Nicolas Hoffmann",
@@ -18,23 +34,13 @@
       "web": "https://www.nicolas-hoffmann.net/"
     }
   ],
-  "dependencies": {
-    "jquery": ">=1.0.0"
+  "scripts": {
+    "test": "eslint ."
   },
-  "bugs": {
-    "web": "https://github.com/nico3333fr/jquery-accessible-accordion-aria/issues"
+  "devDependencies": {
+    "eslint": "^4.8.0"
   },
-  "repositories": [
-    {
-      "type": "git",
-      "url": "https://github.com/nico3333fr/jquery-accessible-accordion-aria.git"
-    }
-  ],
-  "licenses": [
-    {
-      "name": "MIT",
-      "url": "https://github.com/nico3333fr/jquery-accessible-accordion-aria/blob/master/LICENSE"
-    }
-  ],
-  "homepage": "https://a11y.nicolas-hoffmann.net/accordion/"
+  "dependencies": {
+    "jquery": ">=1.0.0"
+  }
 }