diff --git a/auto-complete.js b/auto-complete.js
index 385cc99..86b95ab 100644
--- a/auto-complete.js
+++ b/auto-complete.js
@@ -39,7 +39,15 @@ var autoComplete = (function(){
                 // escape special characters
                 search = search.replace(/[-\/\\^$*+?.()|[\]{}]/g, '\\$&');
                 var re = new RegExp("(" + search.split(' ').join('|') + ")", "gi");
-                return '<div class="autocomplete-suggestion" data-val="' + item + '">' + item.replace(re, "<b>$1</b>") + '</div>';
+                var option = document.createElement('div');
+
+                option.id = Math.random().toString(36).substring(7);
+                option.className = "autocomplete-suggestion";
+                option.setAttribute('role', 'option');
+                option.setAttribute('data-val', item);
+                option.innerHTML = item.replace(re, "<b>$1</b>");
+
+                return option.outerHTML;
             },
             onSelect: function(e, term, item){}
         };
@@ -49,10 +57,20 @@ var autoComplete = (function(){
         var elems = typeof o.selector == 'object' ? [o.selector] : document.querySelectorAll(o.selector);
         for (var i=0; i<elems.length; i++) {
             var that = elems[i];
+            var autocompleteID = Math.random().toString(36).substring(7);
+
+            that.setAttribute('role', 'combobox');
+            that.setAttribute('aria-expanded', 'false');
+            that.setAttribute('aria-autocomplete', 'list');
+            that.setAttribute('aria-owns', autocompleteID);
 
             // create suggestions container "sc"
             that.sc = document.createElement('div');
+            that.sc.id = autocompleteID;
             that.sc.className = 'autocomplete-suggestions '+o.menuClass;
+            that.sc.setAttribute('role', 'listbox');
+            that.sc.setAttribute('aria-live', 'polite');
+            that.sc.setAttribute('aria-relevant', 'additions removals');
 
             that.autocompleteAttr = that.getAttribute('autocomplete');
             that.setAttribute('autocomplete', 'off');
@@ -60,6 +78,8 @@ var autoComplete = (function(){
             that.last_val = '';
 
             that.updateSC = function(resize, next){
+                that.setAttribute('aria-expanded', 'true');
+
                 var rect = that.getBoundingClientRect();
                 that.sc.style.left = rect.left + (window.pageXOffset || document.documentElement.scrollLeft) + 'px';
                 that.sc.style.top = rect.bottom + (window.pageYOffset || document.documentElement.scrollTop) + 1 + 'px';
@@ -84,12 +104,13 @@ var autoComplete = (function(){
 
             live('autocomplete-suggestion', 'mouseleave', function(e){
                 var sel = that.sc.querySelector('.autocomplete-suggestion.selected');
-                if (sel) setTimeout(function(){ sel.className = sel.className.replace('selected', ''); }, 20);
+                if (sel) setTimeout(function(){ sel.className = sel.className.replace('selected', ''); that.removeAttribute('aria-activedescendant');}, 20);
             }, that.sc);
 
             live('autocomplete-suggestion', 'mouseover', function(e){
                 var sel = that.sc.querySelector('.autocomplete-suggestion.selected');
                 if (sel) sel.className = sel.className.replace('selected', '');
+                that.setAttribute('aria-activedescendant', this.id);
                 this.className += ' selected';
             }, that.sc);
 
@@ -123,6 +144,7 @@ var autoComplete = (function(){
                 }
                 else
                     that.sc.style.display = 'none';
+                    that.removeAttribute('aria-activedescendant');
             }
 
             that.keydownHandler = function(e){
@@ -134,14 +156,16 @@ var autoComplete = (function(){
                         next = (key == 40) ? that.sc.querySelector('.autocomplete-suggestion') : that.sc.childNodes[that.sc.childNodes.length - 1]; // first : last
                         next.className += ' selected';
                         that.value = next.getAttribute('data-val');
+                        that.setAttribute('aria-activedescendant', next.id);
                     } else {
                         next = (key == 40) ? sel.nextSibling : sel.previousSibling;
                         if (next) {
                             sel.className = sel.className.replace('selected', '');
                             next.className += ' selected';
                             that.value = next.getAttribute('data-val');
+                            that.setAttribute('aria-activedescendant', next.id);
                         }
-                        else { sel.className = sel.className.replace('selected', ''); that.value = that.last_val; next = 0; }
+                        else { sel.className = sel.className.replace('selected', ''); that.value = that.last_val; next = 0; that.removeAttribute('aria-activedescendant'); }
                     }
                     that.updateSC(0, next);
                     return false;
@@ -198,6 +222,7 @@ var autoComplete = (function(){
                 removeEvent(that, 'focus', that.focusHandler);
                 removeEvent(that, 'keydown', that.keydownHandler);
                 removeEvent(that, 'keyup', that.keyupHandler);
+                that.removeAttribute('aria-activedescendant');
                 if (that.autocompleteAttr)
                     that.setAttribute('autocomplete', that.autocompleteAttr);
                 else
diff --git a/auto-complete.min.js b/auto-complete.min.js
index 0c963ad..e6eb0a1 100644
--- a/auto-complete.min.js
+++ b/auto-complete.min.js
@@ -1,3 +1,3 @@
 // JavaScript autoComplete v1.0.3
 // https://github.com/Pixabay/JavaScript-autoComplete
-var autoComplete=function(){function e(e){function t(e,t){return e.classList?e.classList.contains(t):new RegExp("\\b"+t+"\\b").test(e.className)}function o(e,t,o){e.attachEvent?e.attachEvent("on"+t,o):e.addEventListener(t,o)}function s(e,t,o){e.detachEvent?e.detachEvent("on"+t,o):e.removeEventListener(t,o)}function n(e,s,n,l){o(l||document,s,function(o){for(var s,l=o.target||o.srcElement;l&&!(s=t(l,e));)l=l.parentElement;s&&n.call(l,o)})}if(document.querySelector){var l={selector:0,source:0,minChars:3,delay:150,cache:1,menuClass:"",renderItem:function(e,t){t=t.replace(/[-\/\\^$*+?.()|[\]{}]/g,"\\$&");var o=new RegExp("("+t.split(" ").join("|")+")","gi");return'<div class="autocomplete-suggestion" data-val="'+e+'">'+e.replace(o,"<b>$1</b>")+"</div>"},onSelect:function(e,t,o){}};for(var c in e)e.hasOwnProperty(c)&&(l[c]=e[c]);for(var a="object"==typeof l.selector?[l.selector]:document.querySelectorAll(l.selector),u=0;u<a.length;u++){var i=a[u];i.sc=document.createElement("div"),i.sc.className="autocomplete-suggestions "+l.menuClass,i.autocompleteAttr=i.getAttribute("autocomplete"),i.setAttribute("autocomplete","off"),i.cache={},i.last_val="",i.updateSC=function(e,t){var o=i.getBoundingClientRect();if(i.sc.style.left=o.left+(window.pageXOffset||document.documentElement.scrollLeft)+"px",i.sc.style.top=o.bottom+(window.pageYOffset||document.documentElement.scrollTop)+1+"px",i.sc.style.width=o.right-o.left+"px",!e&&(i.sc.style.display="block",i.sc.maxHeight||(i.sc.maxHeight=parseInt((window.getComputedStyle?getComputedStyle(i.sc,null):i.sc.currentStyle).maxHeight)),i.sc.suggestionHeight||(i.sc.suggestionHeight=i.sc.querySelector(".autocomplete-suggestion").offsetHeight),i.sc.suggestionHeight))if(t){var s=i.sc.scrollTop,n=t.getBoundingClientRect().top-i.sc.getBoundingClientRect().top;n+i.sc.suggestionHeight-i.sc.maxHeight>0?i.sc.scrollTop=n+i.sc.suggestionHeight+s-i.sc.maxHeight:0>n&&(i.sc.scrollTop=n+s)}else i.sc.scrollTop=0},o(window,"resize",i.updateSC),document.body.appendChild(i.sc),n("autocomplete-suggestion","mouseleave",function(e){var t=i.sc.querySelector(".autocomplete-suggestion.selected");t&&setTimeout(function(){t.className=t.className.replace("selected","")},20)},i.sc),n("autocomplete-suggestion","mouseover",function(e){var t=i.sc.querySelector(".autocomplete-suggestion.selected");t&&(t.className=t.className.replace("selected","")),this.className+=" selected"},i.sc),n("autocomplete-suggestion","mousedown",function(e){if(t(this,"autocomplete-suggestion")){var o=this.getAttribute("data-val");i.value=o,l.onSelect(e,o,this),i.sc.style.display="none"}},i.sc),i.blurHandler=function(){try{var e=document.querySelector(".autocomplete-suggestions:hover")}catch(t){var e=0}e?i!==document.activeElement&&setTimeout(function(){i.focus()},20):(i.last_val=i.value,i.sc.style.display="none",setTimeout(function(){i.sc.style.display="none"},350))},o(i,"blur",i.blurHandler);var r=function(e){var t=i.value;if(i.cache[t]=e,e.length&&t.length>=l.minChars){for(var o="",s=0;s<e.length;s++)o+=l.renderItem(e[s],t);i.sc.innerHTML=o,i.updateSC(0)}else i.sc.style.display="none"};i.keydownHandler=function(e){var t=window.event?e.keyCode:e.which;if((40==t||38==t)&&i.sc.innerHTML){var o,s=i.sc.querySelector(".autocomplete-suggestion.selected");return s?(o=40==t?s.nextSibling:s.previousSibling,o?(s.className=s.className.replace("selected",""),o.className+=" selected",i.value=o.getAttribute("data-val")):(s.className=s.className.replace("selected",""),i.value=i.last_val,o=0)):(o=40==t?i.sc.querySelector(".autocomplete-suggestion"):i.sc.childNodes[i.sc.childNodes.length-1],o.className+=" selected",i.value=o.getAttribute("data-val")),i.updateSC(0,o),!1}if(27==t)i.value=i.last_val,i.sc.style.display="none";else if(13==t||9==t){var s=i.sc.querySelector(".autocomplete-suggestion.selected");s&&"none"!=i.sc.style.display&&(l.onSelect(e,s.getAttribute("data-val"),s),setTimeout(function(){i.sc.style.display="none"},20))}},o(i,"keydown",i.keydownHandler),i.keyupHandler=function(e){var t=window.event?e.keyCode:e.which;if(!t||(35>t||t>40)&&13!=t&&27!=t){var o=i.value;if(o.length>=l.minChars){if(o!=i.last_val){if(i.last_val=o,clearTimeout(i.timer),l.cache){if(o in i.cache)return void r(i.cache[o]);for(var s=1;s<o.length-l.minChars;s++){var n=o.slice(0,o.length-s);if(n in i.cache&&!i.cache[n].length)return void r([])}}i.timer=setTimeout(function(){l.source(o,r)},l.delay)}}else i.last_val=o,i.sc.style.display="none"}},o(i,"keyup",i.keyupHandler),i.focusHandler=function(e){i.last_val="\n",i.keyupHandler(e)},l.minChars||o(i,"focus",i.focusHandler)}this.destroy=function(){for(var e=0;e<a.length;e++){var t=a[e];s(window,"resize",t.updateSC),s(t,"blur",t.blurHandler),s(t,"focus",t.focusHandler),s(t,"keydown",t.keydownHandler),s(t,"keyup",t.keyupHandler),t.autocompleteAttr?t.setAttribute("autocomplete",t.autocompleteAttr):t.removeAttribute("autocomplete"),document.body.removeChild(t.sc),t=null}}}}return e}();!function(){"function"==typeof define&&define.amd?define("autoComplete",function(){return autoComplete}):"undefined"!=typeof module&&module.exports?module.exports=autoComplete:window.autoComplete=autoComplete}();
\ No newline at end of file
+var autoComplete=function(){function e(e){function t(e,t){return e.classList?e.classList.contains(t):new RegExp("\\b"+t+"\\b").test(e.className)}function s(e,t,s){e.attachEvent?e.attachEvent("on"+t,s):e.addEventListener(t,s)}function a(e,t,s){e.detachEvent?e.detachEvent("on"+t,s):e.removeEventListener(t,s)}function o(e,a,o,n){s(n||document,a,function(s){for(var a,n=s.target||s.srcElement;n&&!(a=t(n,e));)n=n.parentElement;a&&o.call(n,s)})}if(document.querySelector){var n={selector:0,source:0,minChars:3,delay:150,cache:1,menuClass:"",renderItem:function(e,t){t=t.replace(/[-\/\\^$*+?.()|[\]{}]/g,"\\$&");var s=new RegExp("("+t.split(" ").join("|")+")","gi"),a=document.createElement("option");return a.id=Math.random().toString(36).substring(7),a.className="autocomplete-suggestion",a.setAttribute("role","option"),a.setAttribute("data-val",e),a.innerHTML=e.replace(s,"<b>$1</b>"),a.outerHTML},onSelect:function(){}};for(var c in e)e.hasOwnProperty(c)&&(n[c]=e[c]);for(var l="object"==typeof n.selector?[n.selector]:document.querySelectorAll(n.selector),i=0;i<l.length;i++){var r=l[i],u=Math.random().toString(36).substring(7);r.setAttribute("role","combobox"),r.setAttribute("aria-expanded","false"),r.setAttribute("aria-autocomplete","list"),r.setAttribute("aria-owns",u),r.sc=document.createElement("datalist"),r.sc.id=u,r.sc.className="autocomplete-suggestions "+n.menuClass,r.sc.setAttribute("role","listbox"),r.sc.setAttribute("aria-live","polite"),r.sc.setAttribute("aria-relevant","additions removals"),r.autocompleteAttr=r.getAttribute("autocomplete"),r.setAttribute("autocomplete","off"),r.cache={},r.last_val="",r.updateSC=function(e,t){r.setAttribute("aria-expanded","true");var s=r.getBoundingClientRect();if(r.sc.style.left=s.left+(window.pageXOffset||document.documentElement.scrollLeft)+"px",r.sc.style.top=s.bottom+(window.pageYOffset||document.documentElement.scrollTop)+1+"px",r.sc.style.width=s.right-s.left+"px",!e&&(r.sc.style.display="block",r.sc.maxHeight||(r.sc.maxHeight=parseInt((window.getComputedStyle?getComputedStyle(r.sc,null):r.sc.currentStyle).maxHeight)),r.sc.suggestionHeight||(r.sc.suggestionHeight=r.sc.querySelector(".autocomplete-suggestion").offsetHeight),r.sc.suggestionHeight))if(t){var a=r.sc.scrollTop,o=t.getBoundingClientRect().top-r.sc.getBoundingClientRect().top;o+r.sc.suggestionHeight-r.sc.maxHeight>0?r.sc.scrollTop=o+r.sc.suggestionHeight+a-r.sc.maxHeight:0>o&&(r.sc.scrollTop=o+a)}else r.sc.scrollTop=0},s(window,"resize",r.updateSC),document.body.appendChild(r.sc),o("autocomplete-suggestion","mouseleave",function(){var e=r.sc.querySelector(".autocomplete-suggestion.selected");e&&setTimeout(function(){e.className=e.className.replace("selected",""),r.removeAttribute("aria-activedescendant")},20)},r.sc),o("autocomplete-suggestion","mouseover",function(){var e=r.sc.querySelector(".autocomplete-suggestion.selected");e&&(e.className=e.className.replace("selected","")),r.setAttribute("aria-activedescendant",this.id),this.className+=" selected"},r.sc),o("autocomplete-suggestion","mousedown",function(e){if(t(this,"autocomplete-suggestion")){var s=this.getAttribute("data-val");r.value=s,n.onSelect(e,s,this),r.sc.style.display="none"}},r.sc),r.blurHandler=function(){try{var e=document.querySelector(".autocomplete-suggestions:hover")}catch(t){var e=0}e?r!==document.activeElement&&setTimeout(function(){r.focus()},20):(r.last_val=r.value,r.sc.style.display="none",setTimeout(function(){r.sc.style.display="none"},350))},s(r,"blur",r.blurHandler);var d=function(e){var t=r.value;if(r.cache[t]=e,e.length&&t.length>=n.minChars){for(var s="",a=0;a<e.length;a++)s+=n.renderItem(e[a],t);r.sc.innerHTML=s,r.updateSC(0)}else r.sc.style.display="none";r.removeAttribute("aria-activedescendant")};r.keydownHandler=function(e){var t=window.event?e.keyCode:e.which;if((40==t||38==t)&&r.sc.innerHTML){var s,a=r.sc.querySelector(".autocomplete-suggestion.selected");return a?(s=40==t?a.nextSibling:a.previousSibling,s?(a.className=a.className.replace("selected",""),s.className+=" selected",r.value=s.getAttribute("data-val"),r.setAttribute("aria-activedescendant",s.id)):(a.className=a.className.replace("selected",""),r.value=r.last_val,s=0,r.removeAttribute("aria-activedescendant"))):(s=40==t?r.sc.querySelector(".autocomplete-suggestion"):r.sc.childNodes[r.sc.childNodes.length-1],s.className+=" selected",r.value=s.getAttribute("data-val"),r.setAttribute("aria-activedescendant",s.id)),r.updateSC(0,s),!1}if(27==t)r.value=r.last_val,r.sc.style.display="none";else if(13==t||9==t){var a=r.sc.querySelector(".autocomplete-suggestion.selected");a&&"none"!=r.sc.style.display&&(n.onSelect(e,a.getAttribute("data-val"),a),setTimeout(function(){r.sc.style.display="none"},20))}},s(r,"keydown",r.keydownHandler),r.keyupHandler=function(e){var t=window.event?e.keyCode:e.which;if(!t||(35>t||t>40)&&13!=t&&27!=t){var s=r.value;if(s.length>=n.minChars){if(s!=r.last_val){if(r.last_val=s,clearTimeout(r.timer),n.cache){if(s in r.cache)return void d(r.cache[s]);for(var a=1;a<s.length-n.minChars;a++){var o=s.slice(0,s.length-a);if(o in r.cache&&!r.cache[o].length)return void d([])}}r.timer=setTimeout(function(){n.source(s,d)},n.delay)}}else r.last_val=s,r.sc.style.display="none"}},s(r,"keyup",r.keyupHandler),r.focusHandler=function(e){r.last_val="\n",r.keyupHandler(e)},n.minChars||s(r,"focus",r.focusHandler)}this.destroy=function(){for(var e=0;e<l.length;e++){var t=l[e];a(window,"resize",t.updateSC),a(t,"blur",t.blurHandler),a(t,"focus",t.focusHandler),a(t,"keydown",t.keydownHandler),a(t,"keyup",t.keyupHandler),t.removeAttribute("aria-activedescendant"),t.autocompleteAttr?t.setAttribute("autocomplete",t.autocompleteAttr):t.removeAttribute("autocomplete"),document.body.removeChild(t.sc),t=null}}}}return e}();!function(){"function"==typeof define&&define.amd?define("autoComplete",function(){return autoComplete}):"undefined"!=typeof module&&module.exports?module.exports=autoComplete:window.autoComplete=autoComplete}();
\ No newline at end of file
diff --git a/package.json b/package.json
new file mode 100644
index 0000000..47e30cd
--- /dev/null
+++ b/package.json
@@ -0,0 +1,47 @@
+{
+  "name": "javascript-auto-complete",
+  "version": "1.0.4",
+  "description": "An extremely lightweight vanilla JavaScript completion suggester.",
+  "homepage": "https://github.com/SchipholRedesign/JavaScript-autoComplete",
+  "main": "auto-complete.js",
+  "scripts": {
+    "test": "echo \"Error: no test specified\" && exit 1"
+  },
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/SchipholRedesign/JavaScript-autoComplete.git"
+  },
+  "authors": [{
+    "name": "Simon Steinberger",
+    "email": "simon@pixabay.com",
+    "url": "https://pixabay.com/users/Simon/"
+  }],
+  "contributors": [{
+    "name" : "Michiel Renty",
+    "email" : "michiel@mrenty.com",
+    "url" : "http://mrenty.com/"
+  }],
+  "keywords": [
+    "autocomplete",
+    "autosuggest",
+    "autosuggester",
+    "suggest",
+    "suggester",
+    "completer",
+    "select",
+    "dropdown",
+    "ajax"
+  ],
+  "licenses": [{
+    "type": "MIT",
+    "url": "http://www.opensource.org/licenses/mit-license.php"
+  }],
+  "bugs": {
+    "url": "https://github.com/SchipholRedesign/JavaScript-autoComplete/issues"
+  },
+  "ignore": [
+    "bower.json",
+    "demo.html",
+    "readme.md"
+  ]
+}
\ No newline at end of file
diff --git a/readme.md b/readme.md
index e8bdde9..6245d8f 100644
--- a/readme.md
+++ b/readme.md
@@ -17,11 +17,16 @@ https://goodies.pixabay.com/javascript/auto-complete/demo.html
 
 * Lightweight: 5.4 kB of JavaScript - less than 2.4 kB gzipped
 * Fully flexible data source
+* Fully accessible
 * Smart caching, delay and minimum character settings
 * Callbacks
 
 ## Changelog
 
+### Version 1.0.4 - 2015/11/11
+
+* Added ARIA support
+
 ### Version 1.0.3 - 2015/11/02
 
 * Fixed #2: Unspecified error on IE 10.