diff --git a/README.md b/README.md
index 2d6d23c..1aa211c 100644
--- a/README.md
+++ b/README.md
@@ -220,6 +220,7 @@ Here are all of the available options and their defaults:
     attr: {
       role: 'button',
       'aria-label': 'Show Password',
+      title: 'Show Password',
       tabIndex: 0
     }
   },
@@ -270,7 +271,10 @@ Here are all of the available options and their defaults:
       toggle: {
         className: 'hideShowPassword-toggle-hide',
         content: 'Hide',
-        attr: { 'aria-pressed': 'true' }
+        attr: { 
+          'aria-pressed': 'true'
+          title: 'Hide Password',
+        }
       }
     },
     hidden: {
@@ -280,7 +284,10 @@ Here are all of the available options and their defaults:
       toggle: {
         className: 'hideShowPassword-toggle-show',
         content: 'Show',
-        attr: { 'aria-pressed': 'false' }
+        attr: { 
+          'aria-pressed': 'false',
+          title: 'Show Password',
+        }
       }
     }
   }
diff --git a/hideShowPassword.js b/hideShowPassword.js
index 5174fb9..db84add 100644
--- a/hideShowPassword.js
+++ b/hideShowPassword.js
@@ -112,6 +112,7 @@
       attr: {
         role: 'button',
         'aria-label': 'Show Password',
+        title: 'Show Password',
         tabIndex: 0
       }
     },
@@ -162,7 +163,10 @@
         toggle: {
           className: 'hideShowPassword-toggle-hide',
           content: 'Hide',
-          attr: { 'aria-pressed': 'true' }
+          attr: { 
+            'aria-pressed': 'true',
+            title: 'Hide Password' 
+          }
         }
       },
       hidden: {
@@ -172,7 +176,10 @@
         toggle: {
           className: 'hideShowPassword-toggle-show',
           content: 'Show',
-          attr: { 'aria-pressed': 'false' }
+          attr: { 
+            'aria-pressed': 'false',
+            title: 'Show Password'
+          }
         }
       }
     }
diff --git a/hideShowPassword.min.js b/hideShowPassword.min.js
index b061f49..d901d26 100644
--- a/hideShowPassword.min.js
+++ b/hideShowPassword.min.js
@@ -1 +1 @@
-(function(factory){if(typeof define==="function"&&define.amd){define(["jquery"],factory)}else if(typeof exports==="object"){factory(require("jquery"))}else{factory(jQuery)}})(function($,undef){var dataKey="plugin_hideShowPassword",shorthandArgs=["show","innerToggle"],SPACE=32,ENTER=13;var canSetInputAttribute=function(){var body=document.body,input=document.createElement("input"),result=true;if(!body){body=document.createElement("body")}input=body.appendChild(input);try{input.setAttribute("type","text")}catch(e){result=false}body.removeChild(input);return result}();var defaults={show:"infer",innerToggle:false,enable:canSetInputAttribute,className:"hideShowPassword-field",initEvent:"hideShowPasswordInit",changeEvent:"passwordVisibilityChange",props:{autocapitalize:"off",autocomplete:"off",autocorrect:"off",spellcheck:"false"},toggle:{element:'<button type="button">',className:"hideShowPassword-toggle",touchSupport:typeof Modernizr==="undefined"?false:Modernizr.touch,attachToEvent:"click.hideShowPassword",attachToTouchEvent:"touchstart.hideShowPassword mousedown.hideShowPassword",attachToKeyEvent:"keyup",attachToKeyCodes:true,styles:{position:"absolute"},touchStyles:{pointerEvents:"none"},position:"infer",verticalAlign:"middle",offset:0,attr:{role:"button","aria-label":"Show Password",tabIndex:0}},wrapper:{element:"<div>",className:"hideShowPassword-wrapper",enforceWidth:true,styles:{position:"relative"},inheritStyles:["display","verticalAlign","marginTop","marginRight","marginBottom","marginLeft"],innerElementStyles:{marginTop:0,marginRight:0,marginBottom:0,marginLeft:0}},states:{shown:{className:"hideShowPassword-shown",changeEvent:"passwordShown",props:{type:"text"},toggle:{className:"hideShowPassword-toggle-hide",content:"Hide",attr:{"aria-pressed":"true"}}},hidden:{className:"hideShowPassword-hidden",changeEvent:"passwordHidden",props:{type:"password"},toggle:{className:"hideShowPassword-toggle-show",content:"Show",attr:{"aria-pressed":"false"}}}}};function HideShowPassword(element,options){this.element=$(element);this.wrapperElement=$();this.toggleElement=$();this.init(options)}HideShowPassword.prototype={init:function(options){if(this.update(options,defaults)){this.element.addClass(this.options.className);if(this.options.innerToggle){this.wrapElement(this.options.wrapper);this.initToggle(this.options.toggle);if(typeof this.options.innerToggle==="string"){this.toggleElement.hide();this.element.one(this.options.innerToggle,$.proxy(function(){this.toggleElement.show()},this))}}this.element.trigger(this.options.initEvent,[this])}},update:function(options,base){this.options=this.prepareOptions(options,base);if(this.updateElement()){this.element.trigger(this.options.changeEvent,[this]).trigger(this.state().changeEvent,[this])}return this.options.enable},toggle:function(showVal){showVal=showVal||"toggle";return this.update({show:showVal})},prepareOptions:function(options,base){var original=options||{},keyCodes=[],testElement;base=base||this.options;options=$.extend(true,{},base,options);if(original.hasOwnProperty("wrapper")&&original.wrapper.hasOwnProperty("inheritStyles")){options.wrapper.inheritStyles=original.wrapper.inheritStyles}if(options.enable){if(options.show==="toggle"){options.show=this.isType("hidden",options.states)}else if(options.show==="infer"){options.show=this.isType("shown",options.states)}if(options.toggle.position==="infer"){options.toggle.position=this.element.css("text-direction")==="rtl"?"left":"right"}if(!$.isArray(options.toggle.attachToKeyCodes)){if(options.toggle.attachToKeyCodes===true){testElement=$(options.toggle.element);switch(testElement.prop("tagName").toLowerCase()){case"button":case"input":break;case"a":if(testElement.filter("[href]").length){keyCodes.push(SPACE);break}default:keyCodes.push(SPACE,ENTER);break}}options.toggle.attachToKeyCodes=keyCodes}}return options},updateElement:function(){if(!this.options.enable||this.isType())return false;this.element.prop($.extend({},this.options.props,this.state().props)).addClass(this.state().className).removeClass(this.otherState().className);this.updateToggle();return true},isType:function(comparison,states){states=states||this.options.states;comparison=comparison||this.state(undef,undef,states).props.type;if(states[comparison]){comparison=states[comparison].props.type}return this.element.prop("type")===comparison},state:function(key,invert,states){states=states||this.options.states;if(key===undef){key=this.options.show}if(typeof key==="boolean"){key=key?"shown":"hidden"}if(invert){key=key==="shown"?"hidden":"shown"}return states[key]},otherState:function(key){return this.state(key,true)},wrapElement:function(options){var enforceWidth=options.enforceWidth,targetWidth;if(!this.wrapperElement.length){targetWidth=this.element.outerWidth();$.each(options.inheritStyles,$.proxy(function(index,prop){options.styles[prop]=this.element.css(prop)},this));this.element.css(options.innerElementStyles).wrap($(options.element).addClass(options.className).css(options.styles));this.wrapperElement=this.element.parent();if(enforceWidth===true){enforceWidth=this.wrapperElement.outerWidth()===targetWidth?false:targetWidth}if(enforceWidth!==false){this.wrapperElement.css("width",enforceWidth)}}return this.wrapperElement},initToggle:function(options){if(!this.toggleElement.length){this.toggleElement=$(options.element).attr(options.attr).addClass(options.className).css(options.styles).appendTo(this.wrapperElement);this.updateToggle();this.positionToggle(options.position,options.verticalAlign,options.offset);if(options.touchSupport){this.toggleElement.css(options.touchStyles);this.element.on(options.attachToTouchEvent,$.proxy(this.toggleTouchEvent,this))}else{this.toggleElement.on(options.attachToEvent,$.proxy(this.toggleEvent,this))}if(options.attachToKeyCodes.length){this.toggleElement.on(options.attachToKeyEvent,$.proxy(this.toggleKeyEvent,this))}}return this.toggleElement},positionToggle:function(position,verticalAlign,offset){var styles={};styles[position]=offset;switch(verticalAlign){case"top":case"bottom":styles[verticalAlign]=offset;break;case"middle":styles.top="50%";styles.marginTop=this.toggleElement.outerHeight()/-2;break}return this.toggleElement.css(styles)},updateToggle:function(state,otherState){var paddingProp,targetPadding;if(this.toggleElement.length){paddingProp="padding-"+this.options.toggle.position;state=state||this.state().toggle;otherState=otherState||this.otherState().toggle;this.toggleElement.attr(state.attr).addClass(state.className).removeClass(otherState.className).html(state.content);targetPadding=this.toggleElement.outerWidth()+this.options.toggle.offset*2;if(this.element.css(paddingProp)!==targetPadding){this.element.css(paddingProp,targetPadding)}}return this.toggleElement},toggleEvent:function(event){event.preventDefault();this.toggle()},toggleKeyEvent:function(event){$.each(this.options.toggle.attachToKeyCodes,$.proxy(function(index,keyCode){if(event.which===keyCode){this.toggleEvent(event);return false}},this))},toggleTouchEvent:function(event){var toggleX=this.toggleElement.offset().left,eventX,lesser,greater;if(toggleX){eventX=event.pageX||event.originalEvent.pageX;if(this.options.toggle.position==="left"){toggleX+=this.toggleElement.outerWidth();lesser=eventX;greater=toggleX}else{lesser=toggleX;greater=eventX}if(greater>=lesser){this.toggleEvent(event)}}}};$.fn.hideShowPassword=function(){var options={};$.each(arguments,function(index,value){var newOptions={};if(typeof value==="object"){newOptions=value}else if(shorthandArgs[index]){newOptions[shorthandArgs[index]]=value}else{return false}$.extend(true,options,newOptions)});return this.each(function(){var $this=$(this),data=$this.data(dataKey);if(data){data.update(options)}else{$this.data(dataKey,new HideShowPassword(this,options))}})};$.each({show:true,hide:false,toggle:"toggle"},function(verb,showVal){$.fn[verb+"Password"]=function(innerToggle,options){return this.hideShowPassword(showVal,innerToggle,options)}})});
\ No newline at end of file
+!function(t){"function"==typeof define&&define.amd?define(["jquery"],t):t("object"==typeof exports?require("jquery"):jQuery)}(function(t,e){function s(e,s){this.element=t(e),this.wrapperElement=t(),this.toggleElement=t(),this.init(s)}var o="plugin_hideShowPassword",i=["show","innerToggle"],n=32,a=13,h=function(){var t=document.body,e=document.createElement("input"),s=!0;t||(t=document.createElement("body")),e=t.appendChild(e);try{e.setAttribute("type","text")}catch(o){s=!1}return t.removeChild(e),s}(),r={show:"infer",innerToggle:!1,enable:h,className:"hideShowPassword-field",initEvent:"hideShowPasswordInit",changeEvent:"passwordVisibilityChange",props:{autocapitalize:"off",autocomplete:"off",autocorrect:"off",spellcheck:"false"},toggle:{element:'<button type="button">',className:"hideShowPassword-toggle",touchSupport:"undefined"==typeof Modernizr?!1:Modernizr.touch,attachToEvent:"click.hideShowPassword",attachToTouchEvent:"touchstart.hideShowPassword mousedown.hideShowPassword",attachToKeyEvent:"keyup",attachToKeyCodes:!0,styles:{position:"absolute"},touchStyles:{pointerEvents:"none"},position:"infer",verticalAlign:"middle",offset:0,attr:{role:"button","aria-label":"Show Password",title:"Show Password",tabIndex:0}},wrapper:{element:"<div>",className:"hideShowPassword-wrapper",enforceWidth:!0,styles:{position:"relative"},inheritStyles:["display","verticalAlign","marginTop","marginRight","marginBottom","marginLeft"],innerElementStyles:{marginTop:0,marginRight:0,marginBottom:0,marginLeft:0}},states:{shown:{className:"hideShowPassword-shown",changeEvent:"passwordShown",props:{type:"text"},toggle:{className:"hideShowPassword-toggle-hide",content:"Hide",attr:{"aria-pressed":"true",title:"Hide Password"}}},hidden:{className:"hideShowPassword-hidden",changeEvent:"passwordHidden",props:{type:"password"},toggle:{className:"hideShowPassword-toggle-show",content:"Show",attr:{"aria-pressed":"false",title:"Show Password"}}}}};s.prototype={init:function(e){this.update(e,r)&&(this.element.addClass(this.options.className),this.options.innerToggle&&(this.wrapElement(this.options.wrapper),this.initToggle(this.options.toggle),"string"==typeof this.options.innerToggle&&(this.toggleElement.hide(),this.element.one(this.options.innerToggle,t.proxy(function(){this.toggleElement.show()},this)))),this.element.trigger(this.options.initEvent,[this]))},update:function(t,e){return this.options=this.prepareOptions(t,e),this.updateElement()&&this.element.trigger(this.options.changeEvent,[this]).trigger(this.state().changeEvent,[this]),this.options.enable},toggle:function(t){return t=t||"toggle",this.update({show:t})},prepareOptions:function(e,s){var o,i=e||{},h=[];if(s=s||this.options,e=t.extend(!0,{},s,e),i.hasOwnProperty("wrapper")&&i.wrapper.hasOwnProperty("inheritStyles")&&(e.wrapper.inheritStyles=i.wrapper.inheritStyles),e.enable&&("toggle"===e.show?e.show=this.isType("hidden",e.states):"infer"===e.show&&(e.show=this.isType("shown",e.states)),"infer"===e.toggle.position&&(e.toggle.position="rtl"===this.element.css("text-direction")?"left":"right"),!t.isArray(e.toggle.attachToKeyCodes))){if(e.toggle.attachToKeyCodes===!0)switch(o=t(e.toggle.element),o.prop("tagName").toLowerCase()){case"button":case"input":break;case"a":if(o.filter("[href]").length){h.push(n);break}default:h.push(n,a)}e.toggle.attachToKeyCodes=h}return e},updateElement:function(){return!this.options.enable||this.isType()?!1:(this.element.prop(t.extend({},this.options.props,this.state().props)).addClass(this.state().className).removeClass(this.otherState().className),this.updateToggle(),!0)},isType:function(t,s){return s=s||this.options.states,t=t||this.state(e,e,s).props.type,s[t]&&(t=s[t].props.type),this.element.prop("type")===t},state:function(t,s,o){return o=o||this.options.states,t===e&&(t=this.options.show),"boolean"==typeof t&&(t=t?"shown":"hidden"),s&&(t="shown"===t?"hidden":"shown"),o[t]},otherState:function(t){return this.state(t,!0)},wrapElement:function(e){var s,o=e.enforceWidth;return this.wrapperElement.length||(s=this.element.outerWidth(),t.each(e.inheritStyles,t.proxy(function(t,s){e.styles[s]=this.element.css(s)},this)),this.element.css(e.innerElementStyles).wrap(t(e.element).addClass(e.className).css(e.styles)),this.wrapperElement=this.element.parent(),o===!0&&(o=this.wrapperElement.outerWidth()===s?!1:s),o!==!1&&this.wrapperElement.css("width",o)),this.wrapperElement},initToggle:function(e){return this.toggleElement.length||(this.toggleElement=t(e.element).attr(e.attr).addClass(e.className).css(e.styles).appendTo(this.wrapperElement),this.updateToggle(),this.positionToggle(e.position,e.verticalAlign,e.offset),e.touchSupport?(this.toggleElement.css(e.touchStyles),this.element.on(e.attachToTouchEvent,t.proxy(this.toggleTouchEvent,this))):this.toggleElement.on(e.attachToEvent,t.proxy(this.toggleEvent,this)),e.attachToKeyCodes.length&&this.toggleElement.on(e.attachToKeyEvent,t.proxy(this.toggleKeyEvent,this))),this.toggleElement},positionToggle:function(t,e,s){var o={};switch(o[t]=s,e){case"top":case"bottom":o[e]=s;break;case"middle":o.top="50%",o.marginTop=this.toggleElement.outerHeight()/-2}return this.toggleElement.css(o)},updateToggle:function(t,e){var s,o;return this.toggleElement.length&&(s="padding-"+this.options.toggle.position,t=t||this.state().toggle,e=e||this.otherState().toggle,this.toggleElement.attr(t.attr).addClass(t.className).removeClass(e.className).html(t.content),o=this.toggleElement.outerWidth()+2*this.options.toggle.offset,this.element.css(s)!==o&&this.element.css(s,o)),this.toggleElement},toggleEvent:function(t){t.preventDefault(),this.toggle()},toggleKeyEvent:function(e){t.each(this.options.toggle.attachToKeyCodes,t.proxy(function(t,s){return e.which===s?(this.toggleEvent(e),!1):void 0},this))},toggleTouchEvent:function(t){var e,s,o,i=this.toggleElement.offset().left;i&&(e=t.pageX||t.originalEvent.pageX,"left"===this.options.toggle.position?(i+=this.toggleElement.outerWidth(),s=e,o=i):(s=i,o=e),o>=s&&this.toggleEvent(t))}},t.fn.hideShowPassword=function(){var e={};return t.each(arguments,function(s,o){var n={};if("object"==typeof o)n=o;else{if(!i[s])return!1;n[i[s]]=o}t.extend(!0,e,n)}),this.each(function(){var i=t(this),n=i.data(o);n?n.update(e):i.data(o,new s(this,e))})},t.each({show:!0,hide:!1,toggle:"toggle"},function(e,s){t.fn[e+"Password"]=function(t,e){return this.hideShowPassword(s,t,e)}})});