diff --git a/.gitignore b/.gitignore
index aa9510b..4dadc49 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 selectordie_dev.js
-index_dev.html
\ No newline at end of file
+index_dev.html
+_src/selectordie.dev.js
diff --git a/_src/selectordie.js b/_src/selectordie.js
index 590c333..0665851 100644
--- a/_src/selectordie.js
+++ b/_src/selectordie.js
@@ -1,8 +1,8 @@
 /* ===========================================================
  *
  *  Name:          selectordie.js
- *  Updated:       2014-09-17
- *  Version:       0.1.6
+ *  Updated:       2014-10-09
+ *  Version:       0.1.7
  *  Created by:    Per V @ Vst.mn
  *  What?:         The Select or Die JS
  *
@@ -16,8 +16,9 @@
  * =========================================================== */
 
 ; (function ($) {
+    "use strict";
+
     $.fn.selectOrDie = function (method) {
-        "use strict";
 
         var $defaults = {
                 customID:      null,          // String - "" by default - Adds an ID to the SoD
@@ -33,6 +34,7 @@
                 onChange:      $.noop         // Adds a callback function for when the SoD gets changed
             },
             $_settings = {},
+            $_sodKeysWhenClosed = false,
             $_sodFilterTimeout, $_sodViewportTimeout;
 
         var _private = {
@@ -40,7 +42,7 @@
             initSoD: function (options) {
                 $_settings = $.extend({}, $defaults, options);
 
-                return this.each(function (i) {
+                return this.each(function () {
 
                     if ( !$(this).parent().hasClass("sod_select") ) {
                         var $select                = $(this),
@@ -99,13 +101,13 @@
                             "class": "sod_list_wrapper"
                         }).appendTo($sod);
 
-                        // Inserts a <ul> into our wrapper created above. It will host our <option>:s
+                        // Inserts a <span> into our wrapper created above. It will host our <option>:s
                         $sodList = $("<span/>", {
                             "class": "sod_list"
                         }).appendTo($sodListWrapper);
 
-                        // Inserts a <li> for each <option>
-                        $("option, optgroup", $select).each(function (i) {
+                        // Inserts an option <span> for each <option>
+                        $("option, optgroup", $select).each(function () {
                             var $this = $(this);
 
                             if ( $settingsStripEmpty && !$.trim($this.text()) ) { // Strip empty <option>'s from the <select>
@@ -122,7 +124,7 @@
                             $sodListWrapper.show();
 
                             // Calculate a max-height
-                            $(".sod_option:lt(" + $settingsSize + ")", $sodList).each(function (i) {
+                            $(".sod_option:lt(" + $settingsSize + ")", $sodList).each(function () {
                                 $sodHeight += $(this).outerHeight();
                             });
 
@@ -139,16 +141,11 @@
                             .on("click", _private.triggerSod)
                             .on("click", ".sod_option", _private.optionClick)
                             .on("mousemove", ".sod_option", _private.optionHover)
-                            .on("keydown keypress", _private.keyboardUse);
+                            .on("keydown", _private.keyboardUse);
 
                         // Bind change event to the <select>
                         $select.on("change", _private.selectChange);
 
-                        // Blur the SoD when clicking outside it
-                        $("html").on("click", function() {
-                            _private.blurSod($sod);
-                        });
-
                         // When a label for the native select is clicked we want to focus the SoD
                         $(document).on("click", "label[for='" + $select.attr("id") + "']", function(e) {
                             e.preventDefault();
@@ -221,17 +218,23 @@
 
 
             focusSod: function (e) {
-                if( $(e.target).hasClass('sod_label') || $(e.target).hasClass('sod_option')){
+                // Fixes https://github.com/vestman/Select-or-Die/issues/7, thanks cah4a
+                if( $(e.target).hasClass("sod_label") || $(e.target).hasClass("sod_option") ) {
                     return;
                 }
 
                 var $sod        = $(this),
-                    $sodInFocus = $(".sod_select.focus");
+                    $sodInFocus = $(".sod_select.focus").not($sod);
 
                 // If not disabled we'll add focus (and blur other active SoD's)
                 if ( !$sod.hasClass("disabled") ) {
                     _private.blurSod($sodInFocus);
                     $sod.addClass("focus");
+
+                    // Blur the SoD when clicking outside it
+                    $("html").one("click", function() {
+                        _private.blurSod($sod);
+                    });
                 }
                 else {
                     _private.blurSod($sod);
@@ -269,7 +272,7 @@
                 else {
                     // Clears viewport check timeout
                     clearTimeout($_sodViewportTimeout);
-                    $sod.removeClass("open above");
+                    $sod.removeClass("open");
                 }
             }, // triggerSod
 
@@ -281,34 +284,7 @@
                     $sodLabel       = $sod.find(".sod_label"),
                     $sodCycle       = $sod.data("cycle"),
                     $optionActive   = $sodOptions.filter(".active"),
-                    $sodFilterHit, $optionNext, $optionCycle, $scrollList, $scrollOption;
-
-                // "Filter" options list using keybaord based input
-                if ( e.which !== 0 && e.charCode !== 0 ) {
-                    // Clears data-filter timeout
-                    clearTimeout($_sodFilterTimeout);
-
-                    // Append the data-filter with typed character
-                    $sod.data("filter", $sod.data("filter") + String.fromCharCode(e.keyCode|e.charCode));
-
-                    // Check for matches of the typed string
-                    $sodFilterHit = $sodOptions.filter(function() {
-                        return $(this).text().toLowerCase().indexOf($sod.data("filter").toLowerCase()) === 0;
-                    }).not(".disabled, .optgroup").first();
-
-                    // If the typed value is a hit, then set it to active
-                    if ( $sodFilterHit.length ) {
-                        $optionActive.removeClass("active");
-                        $sodFilterHit.addClass("active");
-                        _private.listScroll($sodList, $sodFilterHit);
-                        $sodLabel.get(0).lastChild.nodeValue = $sodFilterHit.text();
-                    }
-
-                    // Set a timeout to empty the data-filter
-                    $_sodFilterTimeout = setTimeout( function() {
-                        $sod.data("filter", "");
-                    }, 500);
-                }
+                    $sodFilterHit, $optionNext, $optionCycle;
 
                 // Highlight prev/next element if up/down key pressed
                 if ( e.which > 36 && e.which < 41 ) {
@@ -334,22 +310,62 @@
                         $optionNext.addClass("active");
                         $sodLabel.get(0).lastChild.nodeValue = $optionNext.text();
                         _private.listScroll($sodList, $optionNext);
+
+                        // If the user used his keys when the SoD was closed we'll
+                        // update the $_sodKeysWhenClosed flag that we use in blurSod()
+                        if ( !$sod.hasClass("open") ) {
+                            $_sodKeysWhenClosed = true;
+                            // $sod.data("closed-keys", true);
+                        }
+
                     }
 
                     // Disables the up/down keys from scrolling the page
                     return false;
                 }
-                else if ( e.which === 13 || (e.which === 32 && $sod.hasClass("open") && $sod.data("filter") === "") ) { // Enter key or space, simulate click() function
+                else if ( e.which === 13 || (e.which === 32 && $sod.hasClass("open") && ($sod.data("filter")[0] === ' ' || $sod.data("filter") === "") ) ) { // Enter key or space, simulate click() function
                     e.preventDefault();
                     $optionActive.click();
                 }
-                else if ( e.which === 32 && !$sod.hasClass("open") && $sod.data("filter") === "" ) { // Space bar, Opens the SoD if already closed
+                else if ( e.which === 32 && !$sod.hasClass("open") && ($sod.data("filter")[0] === ' ' || $sod.data("filter") === "") ) { // Space bar, Opens the SoD if already closed
                     e.preventDefault();
+                    $_sodKeysWhenClosed = false;
                     $sod.click();
                 }
-                else if ( e.which === 27 ) { // Esc key, hides dropdown
+                else if ( e.which === 27 ) { // Esc key, blur the SoD
                     _private.blurSod($sod);
                 }
+
+                // "Filter" options list using keybaord based input
+                if ( e.which !== 0) {
+                    // Clears data-filter timeout
+                    clearTimeout($_sodFilterTimeout);
+
+                    // Append the data-filter with typed character
+                    $sod.data("filter", $sod.data("filter") + String.fromCharCode(e.which));
+
+                    // Check for matches of the typed string
+                    $sodFilterHit = $sodOptions.filter(function() {
+                        return $(this).text().toLowerCase().indexOf($sod.data("filter").toLowerCase()) === 0;
+                    }).not(".disabled, .optgroup").first();
+
+                    // If the typed value is a hit, then set it to active
+                    if ( $sodFilterHit.length ) {
+                        $optionActive.removeClass("active");
+                        $sodFilterHit.addClass("active");
+                        _private.listScroll($sodList, $sodFilterHit);
+                        $sodLabel.get(0).lastChild.nodeValue = $sodFilterHit.text();
+
+                        if ( !$sod.hasClass("open") ) {
+                            $_sodKeysWhenClosed = true;
+                        }
+                    }
+
+                    // Set a timeout to empty the data-filter
+                    $_sodFilterTimeout = setTimeout( function() {
+                        $sod.data("filter", "");
+                    }, 500);
+                }
             }, // keyboardUse
 
 
@@ -372,7 +388,8 @@
                     $optionOptgroup = $clicked.hasClass("optgroup"),
                     $optionIndex    = $sod.find(".sod_option:not('.optgroup')").index(this);
 
-                if ($sod.hasClass("touch")) {
+                // Fixes https://github.com/vestman/Select-or-Die/issues/8, thanks builtbylane
+                if ( $sod.hasClass("touch") ) {
                     return;
                 }
 
@@ -388,7 +405,7 @@
                 clearTimeout($_sodViewportTimeout);
 
                 // Hide the list
-                $sod.removeClass("open above");
+                $sod.removeClass("open");
             }, // optionClick
 
 
@@ -426,7 +443,7 @@
                     // Check the $sod for changes. If the user has used his keys when the SoD was closed
                     // we'll set the currently active option to selected. If the user used his keys when
                     // the SoD was open but didn't make a selection, then we'll restore the SoD
-                    if ( $sod.hasClass("focus") && !$sod.hasClass("open" ) ) {
+                    if ( $_sodKeysWhenClosed && !$optionActive.hasClass("selected") ) {
                         $optionActive.click();
                     }
                     else if ( !$optionActive.hasClass("selected") ) {
@@ -435,9 +452,14 @@
                         $optionSelected.addClass("active");
                     }
 
-                    // Remove above/open class
-                    $sod.removeClass("open focus above");
+                    // Reset the flag indicating whether the user has used his arrow keys when the SoD
+                    // was closed or not
+                    $_sodKeysWhenClosed = false;
+
+                    // Remove open/focus class
+                    $sod.removeClass("open focus");
 
+                    // Blur the SOD
                     $sod.blur();
                 }
             }, // blurSod
@@ -476,7 +498,7 @@
 
 
             isTouch: function () {
-                return (('ontouchstart' in window) || (navigator.MaxTouchPoints > 0) || (navigator.msMaxTouchPoints > 0));
+                return (("ontouchstart" in window) || (navigator.MaxTouchPoints > 0) || (navigator.msMaxTouchPoints > 0));
             } // isTouch
 
         };
@@ -484,7 +506,7 @@
         var methods = {
 
             destroy: function () {
-                return this.each(function (i) {
+                return this.each(function () {
                     var $select = $(this),
                         $sod    = $select.parent();
 
@@ -504,7 +526,7 @@
 
 
             update: function () {
-                return this.each(function (i) {
+                return this.each(function () {
                     var $select  = $(this),
                         $sod     = $select.parent(),
                         $sodList = $sod.find(".sod_list:first");
@@ -523,7 +545,7 @@
                         }
 
                         // Inserts a <span class="sod_option"> for each <option>
-                        $("option, optgroup", $select).each(function (i) {
+                        $("option, optgroup", $select).each(function () {
                             _private.populateSoD($(this), $sodList, $sod);
                         });
                     } else {
@@ -535,7 +557,7 @@
 
 
             disable: function ($value) {
-                return this.each(function (i) {
+                return this.each(function () {
                     var $select = $(this),
                         $sod    = $select.parent();
 
@@ -562,7 +584,7 @@
 
 
             enable: function ($value) {
-                return this.each(function (i) {
+                return this.each(function () {
                     var $select = $(this),
                         $sod    = $select.parent();
 
diff --git a/_src/selectordie.min.js b/_src/selectordie.min.js
index b7db35a..b408a0c 100644
--- a/_src/selectordie.min.js
+++ b/_src/selectordie.min.js
@@ -1,8 +1,8 @@
 /* ===========================================================
  *
  *  Name:          selectordie.min.js
- *  Updated:       2014-09-17
- *  Version:       0.1.6
+ *  Updated:       2014-10-09
+ *  Version:       0.1.7
  *  Created by:    Per V @ Vst.mn
  *  What?:         Minified version the Select or Die JS
  *
@@ -13,4 +13,4 @@
  *
  * =========================================================== */
 
-(function(e){e.fn.selectOrDie=function(t){"use strict";var n={customID:null,customClass:"",placeholder:null,prefix:null,cycle:false,stripEmpty:false,links:false,linksExternal:false,size:0,tabIndex:0,onChange:e.noop},r={},i,s;var o={initSoD:function(t){r=e.extend({},n,t);return this.each(function(t){if(!e(this).parent().hasClass("sod_select")){var n=e(this),i=r.customID?r.customID:n.data("custom-id")?n.data("custom-id"):r.customID,s=r.customClass?r.customClass:n.data("custom-class")?n.data("custom-class"):r.customClass,u=r.prefix?r.prefix:n.data("prefix")?n.data("prefix"):r.prefix,a=r.placeholder?r.placeholder:n.data("placeholder")?n.data("placeholder"):r.placeholder,f=r.cycle||n.data("cycle")?true:r.cycle,l=r.links||n.data("links")?true:r.links,c=r.linksExternal||n.data("links-external")?true:r.linksExternal,h=r.size?r.size:n.data("size")?n.data("size"):r.size,p=r.tabIndex?r.tabIndex:n.data("tabindex")?n.data("tabindex"):n.attr("tabindex")?n.attr("tabindex"):r.tabIndex,d=r.stripEmpty||n.data("strip-empty")?true:r.stripEmpty,v=n.prop("title")?n.prop("title"):null,m=n.is(":disabled")?" disabled":"",g="",y="",b=0,w,E,S;if(u){g='<span class="sod_prefix">'+u+"</span> "}if(a&&!u){y+='<span class="sod_label sod_placeholder">'+a+"</span>"}else{y+='<span class="sod_label">'+g+"</span>"}w=e("<span/>",{id:i,"class":"sod_select "+s+m,title:v,tabindex:p,html:y,"data-cycle":f,"data-links":l,"data-links-external":c,"data-placeholder":a,"data-prefix":u,"data-filter":""}).insertAfter(this);if(o.isTouch()){w.addClass("touch")}E=e("<span/>",{"class":"sod_list_wrapper"}).appendTo(w);S=e("<span/>",{"class":"sod_list"}).appendTo(E);e("option, optgroup",n).each(function(t){var n=e(this);if(d&&!e.trim(n.text())){n.remove()}else{o.populateSoD(n,S,w)}});if(h){E.show();e(".sod_option:lt("+h+")",S).each(function(t){b+=e(this).outerHeight()});E.removeAttr("style");S.css({"max-height":b})}n.appendTo(w);w.on("focusin",o.focusSod).on("click",o.triggerSod).on("click",".sod_option",o.optionClick).on("mousemove",".sod_option",o.optionHover).on("keydown keypress",o.keyboardUse);n.on("change",o.selectChange);e("html").on("click",function(){o.blurSod(w)});e(document).on("click","label[for='"+n.attr("id")+"']",function(e){e.preventDefault();w.focus()})}else{console.log("Select or Die: It looks like the SoD already exists")}})},populateSoD:function(t,n,r){var i=r.data("placeholder"),s=r.data("prefix"),o=t.parent(),u=t.text(),a=t.val(),f=t.data("custom-id")?t.data("custom-id"):null,l=t.data("custom-class")?t.data("custom-class"):"",c=t.is(":disabled")?" disabled ":"",h=t.is(":selected")?" selected active ":"",p=t.data("link")?" link ":"",d=t.data("link-external")?" linkexternal":"";if(t.is("option")){e("<span/>",{"class":"sod_option "+l+c+h+p+d,id:f,title:u,html:u,"data-value":a}).appendTo(n);if(h&&!i||h&&s){r.find(".sod_label").append(u)}if(h&&i&&!s){r.data("label",i)}else if(h){r.data("label",u)}if(o.is("optgroup")){n.find(".sod_option:last").addClass("groupchild");if(o.is(":disabled")){n.find(".sod_option:last").addClass("disabled")}}}else{e("<span/>",{"class":"sod_option optgroup "+c,title:t.prop("label"),html:t.prop("label"),"data-label":t.prop("label")}).appendTo(n)}},focusSod:function(t){if(e(t.target).hasClass("sod_label")||e(t.target).hasClass("sod_option")){return}var n=e(this),r=e(".sod_select.focus");if(!n.hasClass("disabled")){o.blurSod(r);n.addClass("focus")}else{o.blurSod(n)}},triggerSod:function(t){t.stopPropagation();var n=e(this),r=n.find(".sod_list"),i=n.data("placeholder"),u=n.find(".selected");if(!n.hasClass("disabled")&&!n.hasClass("open")&&!n.hasClass("touch")){n.addClass("open");e(".sod_select").not(this).removeClass("open focus");if(i&&!n.data("prefix")){n.find(".sod_label").addClass("sod_placeholder").html(i)}o.listScroll(r,u);o.checkViewport(n,r)}else{clearTimeout(s);n.removeClass("open above")}},keyboardUse:function(t){var n=e(this),r=n.find(".sod_list"),s=n.find(".sod_option"),u=n.find(".sod_label"),a=n.data("cycle"),f=s.filter(".active"),l,c,h,p,d;if(t.which!==0&&t.charCode!==0){clearTimeout(i);n.data("filter",n.data("filter")+String.fromCharCode(t.keyCode|t.charCode));l=s.filter(function(){return e(this).text().toLowerCase().indexOf(n.data("filter").toLowerCase())===0}).not(".disabled, .optgroup").first();if(l.length){f.removeClass("active");l.addClass("active");o.listScroll(r,l);u.get(0).lastChild.nodeValue=l.text()}i=setTimeout(function(){n.data("filter","")},500)}if(t.which>36&&t.which<41){if(t.which===37||t.which===38){c=f.prevAll(":not('.disabled, .optgroup')").first();h=s.not(".disabled, .optgroup").last()}else if(t.which===39||t.which===40){c=f.nextAll(":not('.disabled, .optgroup')").first();h=s.not(".disabled, .optgroup").first()}if(!c.hasClass("sod_option")&&a){c=h}if(c.hasClass("sod_option")||a){f.removeClass("active");c.addClass("active");u.get(0).lastChild.nodeValue=c.text();o.listScroll(r,c)}return false}else if(t.which===13||t.which===32&&n.hasClass("open")&&n.data("filter")===""){t.preventDefault();f.click()}else if(t.which===32&&!n.hasClass("open")&&n.data("filter")===""){t.preventDefault();n.click()}else if(t.which===27){o.blurSod(n)}},optionHover:function(){var t=e(this);if(!t.hasClass("disabled")&&!t.hasClass("optgroup")){t.siblings().removeClass("active").end().addClass("active")}},optionClick:function(t){t.stopPropagation();var n=e(this),r=n.closest(".sod_select"),i=n.hasClass("disabled"),o=n.hasClass("optgroup"),u=r.find(".sod_option:not('.optgroup')").index(this);if(r.hasClass("touch")){return}if(!i&&!o){r.find(".selected, .sod_placeholder").removeClass("selected sod_placeholder");n.addClass("selected");r.find("select option")[u].selected=true;r.find("select").change()}clearTimeout(s);r.removeClass("open above")},selectChange:function(){var t=e(this),n=t.find(":selected"),i=n.text(),s=t.closest(".sod_select");s.find(".sod_label").get(0).lastChild.nodeValue=i;s.data("label",i);r.onChange.call(this);if((s.data("links")||n.data("link"))&&!n.data("link-external")){window.location.href=n.val()}else if(s.data("links-external")||n.data("link-external")){window.open(n.val(),"_blank")}},blurSod:function(t){if(e("body").find(t).length){var n=t.data("label"),r=t.find(".active"),i=t.find(".selected");clearTimeout(s);if(t.hasClass("focus")&&!t.hasClass("open")){r.click()}else if(!r.hasClass("selected")){t.find(".sod_label").get(0).lastChild.nodeValue=n;r.removeClass("active");i.addClass("active")}t.removeClass("open focus above");t.blur()}},checkViewport:function(t,n){var r=t[0].getBoundingClientRect(),i=n.outerHeight();if(r.bottom+i+10>e(window).height()&&r.top-i>10){t.addClass("above")}else{t.removeClass("above")}s=setTimeout(function(){o.checkViewport(t,n)},200)},listScroll:function(e,t){var n=e[0].getBoundingClientRect(),r=t[0].getBoundingClientRect();if(n.top>r.top){e.scrollTop(e.scrollTop()-n.top+r.top)}else if(n.bottom<r.bottom){e.scrollTop(e.scrollTop()-n.bottom+r.bottom)}},isTouch:function(){return"ontouchstart"in window||navigator.MaxTouchPoints>0||navigator.msMaxTouchPoints>0}};var u={destroy:function(){return this.each(function(t){var n=e(this),r=n.parent();if(r.hasClass("sod_select")){n.off("change");r.find("span").remove();n.unwrap()}else{console.log("Select or Die: There's no SoD to destroy")}})},update:function(){return this.each(function(t){var n=e(this),r=n.parent(),i=r.find(".sod_list:first");if(r.hasClass("sod_select")){i.empty();r.find(".sod_label").get(0).lastChild.nodeValue="";if(n.is(":disabled")){r.addClass("disabled")}e("option, optgroup",n).each(function(t){o.populateSoD(e(this),i,r)})}else{console.log("Select or Die: There's no SoD to update")}})},disable:function(t){return this.each(function(n){var r=e(this),i=r.parent();if(i.hasClass("sod_select")){if(typeof t!=="undefined"){i.find(".sod_list:first .sod_option[data-value='"+t+"']").addClass("disabled");i.find(".sod_list:first .sod_option[data-label='"+t+"']").nextUntil(":not(.groupchild)").addClass("disabled");e("option[value='"+t+"'], optgroup[label='"+t+"']",this).prop("disabled",true)}else if(i.hasClass("sod_select")){i.addClass("disabled");r.prop("disabled",true)}}else{console.log("Select or Die: There's no SoD to disable")}})},enable:function(t){return this.each(function(n){var r=e(this),i=r.parent();if(i.hasClass("sod_select")){if(typeof t!=="undefined"){i.find(".sod_list:first .sod_option[data-value='"+t+"']").removeClass("disabled");i.find(".sod_list:first .sod_option[data-label='"+t+"']").nextUntil(":not(.groupchild)").removeClass("disabled");e("option[value='"+t+"'], optgroup[label='"+t+"']",this).prop("disabled",false)}else if(i.hasClass("sod_select")){i.removeClass("disabled");r.prop("disabled",false)}}else{console.log("Select or Die: There's no SoD to enable")}})}};if(u[t]){return u[t].apply(this,Array.prototype.slice.call(arguments,1))}else if(typeof t==="object"||!t){return o.initSoD.apply(this,arguments)}else{e.error('Select or Die: Oh no! No such method "'+t+'" for the SoD instance')}}})(jQuery)
\ No newline at end of file
+!function(a){"use strict";a.fn.selectOrDie=function(b){var f,g,c={customID:null,customClass:"",placeholder:null,prefix:null,cycle:!1,stripEmpty:!1,links:!1,linksExternal:!1,size:0,tabIndex:0,onChange:a.noop},d={},e=!1,h={initSoD:function(b){return d=a.extend({},c,b),this.each(function(){if(a(this).parent().hasClass("sod_select"))console.log("Select or Die: It looks like the SoD already exists");else{var t,u,v,b=a(this),c=d.customID?d.customID:b.data("custom-id")?b.data("custom-id"):d.customID,e=d.customClass?d.customClass:b.data("custom-class")?b.data("custom-class"):d.customClass,f=d.prefix?d.prefix:b.data("prefix")?b.data("prefix"):d.prefix,g=d.placeholder?d.placeholder:b.data("placeholder")?b.data("placeholder"):d.placeholder,i=d.cycle||b.data("cycle")?!0:d.cycle,j=d.links||b.data("links")?!0:d.links,k=d.linksExternal||b.data("links-external")?!0:d.linksExternal,l=d.size?d.size:b.data("size")?b.data("size"):d.size,m=d.tabIndex?d.tabIndex:b.data("tabindex")?b.data("tabindex"):b.attr("tabindex")?b.attr("tabindex"):d.tabIndex,n=d.stripEmpty||b.data("strip-empty")?!0:d.stripEmpty,o=b.prop("title")?b.prop("title"):null,p=b.is(":disabled")?" disabled":"",q="",r="",s=0;f&&(q='<span class="sod_prefix">'+f+"</span> "),r+=g&&!f?'<span class="sod_label sod_placeholder">'+g+"</span>":'<span class="sod_label">'+q+"</span>",t=a("<span/>",{id:c,"class":"sod_select "+e+p,title:o,tabindex:m,html:r,"data-cycle":i,"data-links":j,"data-links-external":k,"data-placeholder":g,"data-prefix":f,"data-filter":""}).insertAfter(this),h.isTouch()&&t.addClass("touch"),u=a("<span/>",{"class":"sod_list_wrapper"}).appendTo(t),v=a("<span/>",{"class":"sod_list"}).appendTo(u),a("option, optgroup",b).each(function(){var b=a(this);n&&!a.trim(b.text())?b.remove():h.populateSoD(b,v,t)}),l&&(u.show(),a(".sod_option:lt("+l+")",v).each(function(){s+=a(this).outerHeight()}),u.removeAttr("style"),v.css({"max-height":s})),b.appendTo(t),t.on("focusin",h.focusSod).on("click",h.triggerSod).on("click",".sod_option",h.optionClick).on("mousemove",".sod_option",h.optionHover).on("keydown",h.keyboardUse),b.on("change",h.selectChange),a(document).on("click","label[for='"+b.attr("id")+"']",function(a){a.preventDefault(),t.focus()})}})},populateSoD:function(b,c,d){var e=d.data("placeholder"),f=d.data("prefix"),g=b.parent(),h=b.text(),i=b.val(),j=b.data("custom-id")?b.data("custom-id"):null,k=b.data("custom-class")?b.data("custom-class"):"",l=b.is(":disabled")?" disabled ":"",m=b.is(":selected")?" selected active ":"",n=b.data("link")?" link ":"",o=b.data("link-external")?" linkexternal":"";b.is("option")?(a("<span/>",{"class":"sod_option "+k+l+m+n+o,id:j,title:h,html:h,"data-value":i}).appendTo(c),(m&&!e||m&&f)&&d.find(".sod_label").append(h),m&&e&&!f?d.data("label",e):m&&d.data("label",h),g.is("optgroup")&&(c.find(".sod_option:last").addClass("groupchild"),g.is(":disabled")&&c.find(".sod_option:last").addClass("disabled"))):a("<span/>",{"class":"sod_option optgroup "+l,title:b.prop("label"),html:b.prop("label"),"data-label":b.prop("label")}).appendTo(c)},focusSod:function(b){if(!a(b.target).hasClass("sod_label")&&!a(b.target).hasClass("sod_option")){var c=a(this),d=a(".sod_select.focus").not(c);c.hasClass("disabled")?h.blurSod(c):(h.blurSod(d),c.addClass("focus"),a("html").one("click",function(){h.blurSod(c)}))}},triggerSod:function(b){b.stopPropagation();var c=a(this),d=c.find(".sod_list"),e=c.data("placeholder"),f=c.find(".selected");c.hasClass("disabled")||c.hasClass("open")||c.hasClass("touch")?(clearTimeout(g),c.removeClass("open")):(c.addClass("open"),a(".sod_select").not(this).removeClass("open focus"),e&&!c.data("prefix")&&c.find(".sod_label").addClass("sod_placeholder").html(e),h.listScroll(d,f),h.checkViewport(c,d))},keyboardUse:function(b){var l,m,n,c=a(this),d=c.find(".sod_list"),g=c.find(".sod_option"),i=c.find(".sod_label"),j=c.data("cycle"),k=g.filter(".active");return b.which>36&&b.which<41?(37===b.which||38===b.which?(m=k.prevAll(":not('.disabled, .optgroup')").first(),n=g.not(".disabled, .optgroup").last()):(39===b.which||40===b.which)&&(m=k.nextAll(":not('.disabled, .optgroup')").first(),n=g.not(".disabled, .optgroup").first()),!m.hasClass("sod_option")&&j&&(m=n),(m.hasClass("sod_option")||j)&&(k.removeClass("active"),m.addClass("active"),i.get(0).lastChild.nodeValue=m.text(),h.listScroll(d,m),c.hasClass("open")||(e=!0)),!1):(13===b.which||32===b.which&&c.hasClass("open")&&(" "===c.data("filter")[0]||""===c.data("filter"))?(b.preventDefault(),k.click()):32!==b.which||c.hasClass("open")||" "!==c.data("filter")[0]&&""!==c.data("filter")?27===b.which&&h.blurSod(c):(b.preventDefault(),e=!1,c.click()),0!==b.which&&(clearTimeout(f),c.data("filter",c.data("filter")+String.fromCharCode(b.which)),l=g.filter(function(){return 0===a(this).text().toLowerCase().indexOf(c.data("filter").toLowerCase())}).not(".disabled, .optgroup").first(),l.length&&(k.removeClass("active"),l.addClass("active"),h.listScroll(d,l),i.get(0).lastChild.nodeValue=l.text(),c.hasClass("open")||(e=!0)),f=setTimeout(function(){c.data("filter","")},500)),void 0)},optionHover:function(){var b=a(this);b.hasClass("disabled")||b.hasClass("optgroup")||b.siblings().removeClass("active").end().addClass("active")},optionClick:function(b){b.stopPropagation();var c=a(this),d=c.closest(".sod_select"),e=c.hasClass("disabled"),f=c.hasClass("optgroup"),h=d.find(".sod_option:not('.optgroup')").index(this);d.hasClass("touch")||(e||f||(d.find(".selected, .sod_placeholder").removeClass("selected sod_placeholder"),c.addClass("selected"),d.find("select option")[h].selected=!0,d.find("select").change()),clearTimeout(g),d.removeClass("open"))},selectChange:function(){var b=a(this),c=b.find(":selected"),e=c.text(),f=b.closest(".sod_select");f.find(".sod_label").get(0).lastChild.nodeValue=e,f.data("label",e),d.onChange.call(this),!f.data("links")&&!c.data("link")||c.data("link-external")?(f.data("links-external")||c.data("link-external"))&&window.open(c.val(),"_blank"):window.location.href=c.val()},blurSod:function(b){if(a("body").find(b).length){var c=b.data("label"),d=b.find(".active"),f=b.find(".selected");clearTimeout(g),e&&!d.hasClass("selected")?d.click():d.hasClass("selected")||(b.find(".sod_label").get(0).lastChild.nodeValue=c,d.removeClass("active"),f.addClass("active")),e=!1,b.removeClass("open focus"),b.blur()}},checkViewport:function(b,c){var d=b[0].getBoundingClientRect(),e=c.outerHeight();d.bottom+e+10>a(window).height()&&d.top-e>10?b.addClass("above"):b.removeClass("above"),g=setTimeout(function(){h.checkViewport(b,c)},200)},listScroll:function(a,b){var c=a[0].getBoundingClientRect(),d=b[0].getBoundingClientRect();c.top>d.top?a.scrollTop(a.scrollTop()-c.top+d.top):c.bottom<d.bottom&&a.scrollTop(a.scrollTop()-c.bottom+d.bottom)},isTouch:function(){return"ontouchstart"in window||navigator.MaxTouchPoints>0||navigator.msMaxTouchPoints>0}},i={destroy:function(){return this.each(function(){var b=a(this),c=b.parent();c.hasClass("sod_select")?(b.off("change"),c.find("span").remove(),b.unwrap()):console.log("Select or Die: There's no SoD to destroy")})},update:function(){return this.each(function(){var b=a(this),c=b.parent(),d=c.find(".sod_list:first");c.hasClass("sod_select")?(d.empty(),c.find(".sod_label").get(0).lastChild.nodeValue="",b.is(":disabled")&&c.addClass("disabled"),a("option, optgroup",b).each(function(){h.populateSoD(a(this),d,c)})):console.log("Select or Die: There's no SoD to update")})},disable:function(b){return this.each(function(){var c=a(this),d=c.parent();d.hasClass("sod_select")?"undefined"!=typeof b?(d.find(".sod_list:first .sod_option[data-value='"+b+"']").addClass("disabled"),d.find(".sod_list:first .sod_option[data-label='"+b+"']").nextUntil(":not(.groupchild)").addClass("disabled"),a("option[value='"+b+"'], optgroup[label='"+b+"']",this).prop("disabled",!0)):d.hasClass("sod_select")&&(d.addClass("disabled"),c.prop("disabled",!0)):console.log("Select or Die: There's no SoD to disable")})},enable:function(b){return this.each(function(){var c=a(this),d=c.parent();d.hasClass("sod_select")?"undefined"!=typeof b?(d.find(".sod_list:first .sod_option[data-value='"+b+"']").removeClass("disabled"),d.find(".sod_list:first .sod_option[data-label='"+b+"']").nextUntil(":not(.groupchild)").removeClass("disabled"),a("option[value='"+b+"'], optgroup[label='"+b+"']",this).prop("disabled",!1)):d.hasClass("sod_select")&&(d.removeClass("disabled"),c.prop("disabled",!1)):console.log("Select or Die: There's no SoD to enable")})}};return i[b]?i[b].apply(this,Array.prototype.slice.call(arguments,1)):"object"!=typeof b&&b?(a.error('Select or Die: Oh no! No such method "'+b+'" for the SoD instance'),void 0):h.initSoD.apply(this,arguments)}}(jQuery);
\ No newline at end of file
diff --git a/bower.json b/bower.json
index 389db98..4e77a08 100644
--- a/bower.json
+++ b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "SelectOrDie",
-  "version": "0.1.6",
+  "version": "0.1.7",
   "license": "MIT",
   "homepage": "https://github.com/vestman/Select-or-Die",
   "authors": [
diff --git a/select-or-die.jquery.json b/select-or-die.jquery.json
index a5deaef..3633314 100644
--- a/select-or-die.jquery.json
+++ b/select-or-die.jquery.json
@@ -1,6 +1,6 @@
 {
   "name": "select-or-die",
-  "version": "0.1.6",
+  "version": "0.1.7",
   "title": "Select or Die",
   "author": {
     "name": "Per Vestman",