diff --git a/dist/javascripts/multiselect.min.js b/dist/javascripts/multiselect.min.js
index c1ee234..6a7aedd 100644
--- a/dist/javascripts/multiselect.min.js
+++ b/dist/javascripts/multiselect.min.js
@@ -1,7 +1,7 @@
 /*!
- * popup-multiselect v2.0.0 (https://github.com/harshniketseta/popupMultiSelect)
+ * popup-multiselect v2.1.0 (https://github.com/harshniketseta/popupMultiSelect)
  * Copyright 2011-2019, Author: Harshniket Seta <harshniketseta@gmail.com>
  * Licensed under MIT (https://github.com/harshniketseta/popupMultiSelect/blob/master/LICENSE)
  */
 
-!function(s){"use strict";function p(t,e){this.options=null,this.enabled=null,this.multiple=null,this.timeout=null,this.modalShown=null,this.$element=null,this.type="multiselect",this.init(t,e)}if(!s.fn.modal)throw new Error("MultiSelect requires modal.js");p.VERSION="0.2.0",p.DEFAULTS={animation:!0,selectTemplate:'<div class="selectWrap clearfix"><span class="select-content"></span><a href="#" class="open-options clickable"><span class="glyphicon glyphicon-list" aria-hidden="true"></span></a></div>',selectOptionTemplate:'<span class="addedOption" ><span class="text"></span><span class="clickable removeOption"><span class="glyphicon glyphicon-remove" aria-hidden="true"></span></span></span>',modalTemplate:'<div class="select modal in" aria-hidden="false"><div class="modal-dialog modal-sm"><div class="modal-content"><div class="modal-header"><span class="pull-right clickable close" aria-hidden="true">x</span><h4 class="modal-title"></h4><div class="help-block"></div></div><div class="modal-body"></div></div></div></div>',modalOptionTemplate:'<div class="option clickable"><span class="option-text"></span><span class="option-tick"><span class="glyphicon glyphicon-ok" aria-hidden="true"></span></span></div>',title:"Select Options"},p.prototype.init=function(t,e){var i=s(t);if(this.$element=i.clone(!0,!0),this.enabled=this.isEnabled(),this.multiple=this.isMultiple(),this.options=this.getOptions(e),!this.$element.is("select"))throw new Error("Popup MultiSelect only possible in select.");this.replaceDefaultSelect(i),this.$selectOptions=this.extractSelectOptions()},p.prototype.isEnabled=function(){return!this.$element.prop("disabled")},p.prototype.isMultiple=function(){return this.$element.prop("multiple")},p.prototype.hasSelectOptions=function(){return 0<this.$selectOptions.length},p.prototype.extractSelectOptions=function(){var n=[],o=this.getOptionConfig(),l=this;return s.each(this.$element.find("option"),function(t,e){var i=new p.Option(e,o);n.push(i),i.isSelected()&&l._optionSelected(i)}),n},p.prototype.replaceDefaultSelect=function(t){var e=this.getMultiSelect();t.replaceWith(e),this.$element.css({visibility:"hidden",height:"0px",width:"0px"}),e.append(this.$element),this.postProcess(),this.initMultiSelect()},p.prototype.initMultiSelect=function(){var e=this;this.getMultiSelectOpen().on("click",function(t){t.preventDefault(),e.show()})},p.prototype.getDefaults=function(){return p.DEFAULTS},p.prototype.getOptions=function(t){return t=s.extend({},this.getDefaults(),this.$element.data(),t),this.multiple||(t.maxSelectionAllowed=1),t},p.prototype.getOptionConfig=function(t){return{modalOptionTemplate:this.options.modalOptionTemplate,selectOptionTemplate:this.options.selectOptionTemplate}},p.prototype.getUID=function(t){for(;t+=~~(1e6*Math.random()),document.getElementById(t););return t},p.prototype.getMultiSelect=function(){if(!this.$multiSelect){this.$multiSelect=s(this.options.selectTemplate),this.enabled||this.$multiSelect.addClass("disabled");for(var t=this.$element.prop("class").split(" "),e=0;e<t.length;e++)this.$multiSelect.addClass(t[e])}var i=this.getUID(this.$element.attr("id")||"selectContainer");return this.$multiSelect.attr("id",i),this.$element.attr("aria-describedby",i),this.$multiSelect},p.prototype.getSelectOpenIcon=function(){return this.getMultiSelectOpen().find("span.glyphicon")},p.prototype.getMultiSelectOpen=function(){return this.$openOptions||(this.$openOptions=this.$multiSelect.find(".open-options"))},p.prototype.getMultiSelectContent=function(){return this.$selectContent||(this.$selectContent=this.$multiSelect.find(".select-content"))},p.prototype.getSelected=function(){return this.getMultiSelectContent().children()},p.prototype.getModal=function(){return this.$modal||(this.$modal=s(this.options.modalTemplate),this.getModalHelpBlock(this.$modal).html(this.getModalHelpTextContent()),this.getModalTitleBlock(this.$modal).html(this.getModalTitle()),this.getModalBody(this.$modal).html(this.getModalBodyContent()),this.initModal(this.$modal)),this.$modal},p.prototype.getModalClose=function(t){return t.find(".close")},p.prototype.getModalHelpBlock=function(t){return(t=t||this.getModal()).find(".help-block")},p.prototype.getModalTitleBlock=function(t){return(t=t||this.getModal()).find(".modal-title")},p.prototype.getModalBody=function(t){return(t=t||this.getModal()).find(".modal-body")},p.prototype.getModalHelpTextContent=function(t,e){var i="",n=this.getSelected().length,o=this.options.maxSelectionAllowed,l=o-n;if(!(o<1))return 0===n&&0<l?i="Select "+l:0<l?i="Select "+l+" more.":0==l&&(i="Done."),i},p.prototype.getModalTitle=function(){return this.options.title},p.prototype.getModalBodyContent=function(){var n=this,o=[];return s.each(this.$selectOptions,function(t,e){var i=e.createModalOption();i.on("click",function(){var t=s(this),e=t.data("multiselect.option");t.hasClass("selected")?n.optionDeSelected(e):n.optionSelected(e)}),o.push(i)}),o},p.prototype.postProcess=function(){var t=this.$multiSelect.height(),e=this.$multiSelect.outerWidth(),i=parseInt(this.$multiSelect.css("padding-right")),n=parseInt(this.$multiSelect.css("padding-left")),o=this.getMultiSelectContent(),l=this.getMultiSelectOpen(),s=this.getSelectOpenIcon(),p=parseInt(s.css("font-size")),a=(t-p)/2,d=e-i-n-p;o.css({width:d}),l.css({height:p,"margin-top":a,"margin-bottom":a,right:i})},p.prototype.updateHelpText=function(t,e){return this.getModalHelpBlock(this.getModal()).html(this.getModalHelpTextContent(t,e)),!0},p.prototype.initModal=function(t){var i=this;this.getModalClose(t).on("click",function(){i.hide()}),t.on("hide.bs.modal",function(t){var e=s.Event("hide.bs."+i.type);i.$element.trigger(e),e.isDefaultPrevented()&&t.preventDefault()}),t.on("hidden.bs.modal",function(t){i.modalShown=!1;var e=s.Event("hidden.bs."+i.type);i.$element.trigger(e),i.cleanModal()})},p.prototype.show=function(){var t=s.Event("show.bs."+this.type);if(this.hasSelectOptions()&&this.enabled){this.$element.trigger(t);var e=s.contains(this.$multiSelect[0].ownerDocument.documentElement,this.$multiSelect[0]);if(t.isDefaultPrevented()||!e)return;var i=this.getModal(),n=this.getUID(this.type);this.appendModal(),i.attr("id",n),this.$multiSelect.attr("aria-describedby",n),this.options.animation&&i.addClass("fade"),s("body").prepend(i);var o=this;i.on("shown.bs.modal",function(){o.modalShown=!0;var t=s.Event("shown.bs."+o.type);o.$element.trigger(t)}),i.modal("show")}},p.prototype.hide=function(){this.getModal().modal("hide")},p.prototype.cleanModal=function(){this.$multiSelect.removeAttr("aria-describedby"),this.$modal.remove(),this.$modal=null},p.prototype.appendModal=function(){s("body").prepend(this.$modal)},p.prototype.addOption=function(t){var e=s("<option></option>",t),i=new p.Option(e,this.getOptionConfig()),n=null;n=s.Event("addingoption.bs."+this.type),this.$element.trigger(n,i),n.isDefaultPrevented()||(this.$element.append(e),this.$selectOptions.push(i),n=s.Event("optionadded.bs."+this.type),this.$element.trigger(n,i),e.prop("selected")&&this.optionSelected(i),this.modalShown&&this.getModalBody().html(this.getModalBodyContent()))},p.prototype.selectOption=function(t){var e=this.$element.find("option[value="+t+"]").data("multiselect.option");this.optionSelected(e)},p.prototype.deselectOption=function(t){var e=this.$element.find("option[value="+t+"]").data("multiselect.option");this.optionDeSelected(e)},p.prototype.enable=function(){if(!this.enabled){this.$multiSelect.removeClass("disabled"),this.$element.prop("disabled",!1),this.enabled=!0;var t=s.Event("enabled.bs."+this.type);this.$element.trigger(t)}},p.prototype.disable=function(){if(this.enabled){this.$multiSelect.addClass("disabled"),this.$element.prop("disabled",!0),this.enabled=!1;var t=s.Event("disabled.bs."+this.type);this.$element.trigger(t)}},p.prototype.optionSelected=function(t){var e=null;if(this.options.maxSelectionAllowed==this.getSelected().length)return e=s.Event("maxselected.bs."+this.type),this.$element.trigger(e,t),!0;e=s.Event("selected.bs."+this.type),this.$element.trigger(e,t),e.isDefaultPrevented()||(t.selected(),this._optionSelected(t),e=s.Event("selectiondone.bs."+this.type),this.$element.trigger(e,t),this.updateHelpText(t,e),this.postProcess())},p.prototype._optionSelected=function(t){var e=this,i=t.getContent();i.find(".removeOption").on("click",function(){e.optionDeSelected(t)}),this.getMultiSelectContent().append(i)},p.prototype.optionDeSelected=function(t){var e=s.Event("deselected.bs."+this.type);this.$element.trigger(e,t),e.isDefaultPrevented()||(t.deselected(),t.getContent().remove(),e=s.Event("deselectiondone.bs."+this.type),this.$element.trigger(e,t),this.updateHelpText(t,e),this.postProcess())},(p.Option=function(t,e){this.options=null,this.enabled=null,this.timeout=null,this.$element=null,this.type="multiselect.option",this.init(t,e)}).DEFAULTS={},p.Option.prototype.init=function(t,e){if(this.$element=s(t),this.enabled=this.isEnabled(),this.options=this.getOptions(e),!this.$element.is("option"))throw new Error("Popup MultiSelect Option only possible on option element.");this.$element.data(this.type,this),this.tip()},p.Option.prototype.tip=function(){this.$tip||(this.$tip=s(this.options.modalOptionTemplate),this.$tip.find(".option-text").html(this.$element.text()),this.enabled||this.$tip.addClass("disabled"),this.isSelected()&&this.selected())},p.Option.prototype.getDefaults=function(){return p.Option.DEFAULTS},p.Option.prototype.getOptions=function(t){return t=s.extend({},this.getDefaults(),this.$element.data(),t)},p.Option.prototype.isEnabled=function(){return!this.$element.prop("disabled")},p.Option.prototype.createModalOption=function(){return this.$tip.data(this.type,this),this.$tip},p.Option.prototype.isSelected=function(){return this.$element.prop("selected")},p.Option.prototype.selected=function(){this.$element.attr("selected","selected"),this.$tip.addClass("selected")},p.Option.prototype.deselected=function(){this.$element.removeAttr("selected"),this.$tip.removeClass("selected")},p.Option.prototype.getContent=function(){return this.$content||(this.$content=s(this.options.selectOptionTemplate),this.$content.find(".text").html(this.$element.html()),this.enabled||this.$content.addClass("disabled"),this.$content.data(this.type,this)),this.$content};var t=s.fn.multiselect;s.fn.multiselect=function(n){var o=Array.prototype.slice.call(arguments);return o.shift(),this.each(function(){var t=s(this),e=t.data("bs.multiselect"),i="object"==typeof n&&n;!e&&/destroy|hide/.test(n)||(e||(t=(e=new p(this,i)).$element).data("bs.multiselect",e),"string"==typeof n&&e[n].apply(e,o))})},s.fn.multiselect.Constructor=p,s.fn.multiselect.noConflict=function(){return s.fn.multiselect=t,this}}(jQuery);
\ No newline at end of file
+!function(l){"use strict";function p(t,e){this.options=null,this.enabled=null,this.multiple=null,this.timeout=null,this.modalShown=null,this.$element=null,this.type="multiselect",this.init(t,e)}if(!l.fn.modal)throw new Error("MultiSelect requires modal.js");p.VERSION="0.2.0",p.DEFAULTS={animation:!0,modalSize:"sm",selectTemplate:'<div class="selectWrap clearfix"><span class="select-content"></span><a href="#" class="open-options clickable"><span class="icon icon-list">&#9776;</span></a></div>',selectOptionTemplate:'<span class="addedOption" ><span class="text"></span><span class="clickable removeOption"><span class="icon icon-remove" aria-hidden="true"></span></span></span>',modalTemplate:'<div class="select modal in" aria-hidden="false"><div class="modal-dialog"><div class="modal-content"><div class="modal-header"><div><h5 class="modal-title"></h5><div class="help-block"></div></div><span class="float-right clickable close" aria-hidden="true">x</span></div><div class="modal-body"></div></div></div></div>',modalOptionTemplate:'<div class="option clickable"><span class="option-text"></span><span class="option-tick"><span class="icon icon-ok" aria-hidden="true">&#x2713;</span></span></div>',title:"Select Options"},p.prototype.init=function(t,e){var i=l(t);if(this.$element=i.clone(!0,!0),this.enabled=this.isEnabled(),this.multiple=this.isMultiple(),this.options=this.getOptions(e),!this.$element.is("select"))throw new Error("Popup MultiSelect only possible in select.");this.replaceDefaultSelect(i),this.$selectOptions=this.extractSelectOptions()},p.prototype.isEnabled=function(){return!this.$element.prop("disabled")},p.prototype.isMultiple=function(){return this.$element.prop("multiple")},p.prototype.hasSelectOptions=function(){return 0<this.$selectOptions.length},p.prototype.extractSelectOptions=function(){var n=[],o=this.getOptionConfig(),s=this;return l.each(this.$element.find("option"),function(t,e){var i=new p.Option(e,o);n.push(i),i.isSelected()&&s._optionSelected(i)}),n},p.prototype.replaceDefaultSelect=function(t){var e=this.getMultiSelect();t.replaceWith(e),this.$element.css({visibility:"hidden",height:"0px",width:"0px"}),e.append(this.$element),this.postProcess(),this.initMultiSelect()},p.prototype.initMultiSelect=function(){var e=this;this.getMultiSelectOpen().on("click",function(t){t.preventDefault(),e.show()})},p.prototype.getDefaults=function(){return p.DEFAULTS},p.prototype.getOptions=function(t){return t=l.extend({},this.getDefaults(),this.$element.data(),t),this.multiple||(t.maxSelectionAllowed=1),t},p.prototype.getOptionConfig=function(t){return{modalOptionTemplate:this.options.modalOptionTemplate,selectOptionTemplate:this.options.selectOptionTemplate}},p.prototype.getUID=function(t){for(;t+=~~(1e6*Math.random()),document.getElementById(t););return t},p.prototype.getMultiSelect=function(){if(!this.$multiSelect){this.$multiSelect=l(this.options.selectTemplate),this.enabled||this.$multiSelect.addClass("disabled");for(var t=this.$element.prop("class").split(" "),e=0;e<t.length;e++)this.$multiSelect.addClass(t[e])}var i=this.getUID(this.$element.attr("id")||"selectContainer");return this.$multiSelect.attr("id",i),this.$element.attr("aria-describedby",i),this.$multiSelect},p.prototype.getSelectOpenIcon=function(){return this.getMultiSelectOpen().find("span.icon")},p.prototype.getMultiSelectOpen=function(){return this.$openOptions||(this.$openOptions=this.$multiSelect.find(".open-options"))},p.prototype.getMultiSelectContent=function(){return this.$selectContent||(this.$selectContent=this.$multiSelect.find(".select-content"))},p.prototype.getSelected=function(){return this.getMultiSelectContent().children()},p.prototype.getModal=function(){return this.$modal||(this.$modal=l(this.options.modalTemplate),this.getModalHelpBlock(this.$modal).html(this.getModalHelpTextContent()),this.getModalTitleBlock(this.$modal).html(this.getModalTitle()),this.getModalBody(this.$modal).html(this.getModalBodyContent()),this.getModalDialog(this.$modal).addClass(this.getModalSizeClass()),this.initModal(this.$modal)),this.$modal},p.prototype.getModalClose=function(t){return t.find(".close")},p.prototype.getModalHelpBlock=function(t){return(t=t||this.getModal()).find(".help-block")},p.prototype.getModalTitleBlock=function(t){return(t=t||this.getModal()).find(".modal-title")},p.prototype.getModalBody=function(t){return(t=t||this.getModal()).find(".modal-body")},p.prototype.getModalDialog=function(t){return(t=t||this.getModal()).find(".modal-dialog")},p.prototype.getModalHelpTextContent=function(t,e){var i="",n=this.getSelected().length,o=this.options.maxSelectionAllowed,s=o-n;if(!(o<1))return 0===n&&0<s?i="Select "+s:0<s?i="Select "+s+" more.":0==s&&(i="Done."),i},p.prototype.getModalTitle=function(){return this.options.title},p.prototype.getModalSizeClass=function(){return"modal-"+this.options.modalSize},p.prototype.getModalBodyContent=function(){var n=this,o=[];return l.each(this.$selectOptions,function(t,e){var i=e.createModalOption();i.on("click",function(){var t=l(this),e=t.data("multiselect.option");t.hasClass("selected")?n.optionDeSelected(e):n.optionSelected(e)}),o.push(i)}),o},p.prototype.postProcess=function(){var t=this.$multiSelect.height(),e=this.$multiSelect.outerWidth(),i=parseInt(this.$multiSelect.css("padding-right")),n=parseInt(this.$multiSelect.css("padding-left")),o=this.getMultiSelectContent(),s=this.getMultiSelectOpen(),l=this.getSelectOpenIcon(),p=parseInt(l.css("font-size")),a=(t-p)/2,d=e-i-n-p;o.css({width:d}),s.css({height:p,"margin-top":a,"margin-bottom":a,right:i})},p.prototype.updateHelpText=function(t,e){return this.getModalHelpBlock(this.getModal()).html(this.getModalHelpTextContent(t,e)),!0},p.prototype.initModal=function(t){var i=this;this.getModalClose(t).on("click",function(){i.hide()}),t.on("hide.bs.modal",function(t){var e=l.Event("hide.bs."+i.type);i.$element.trigger(e),e.isDefaultPrevented()&&t.preventDefault()}),t.on("hidden.bs.modal",function(t){i.modalShown=!1;var e=l.Event("hidden.bs."+i.type);i.$element.trigger(e),i.cleanModal()})},p.prototype.show=function(){var t=l.Event("show.bs."+this.type);if(this.hasSelectOptions()&&this.enabled){this.$element.trigger(t);var e=l.contains(this.$multiSelect[0].ownerDocument.documentElement,this.$multiSelect[0]);if(t.isDefaultPrevented()||!e)return;var i=this.getModal(),n=this.getUID(this.type);this.appendModal(),i.attr("id",n),this.$multiSelect.attr("aria-describedby",n),this.options.animation&&i.addClass("fade"),l("body").prepend(i);var o=this;i.on("shown.bs.modal",function(){o.modalShown=!0;var t=l.Event("shown.bs."+o.type);o.$element.trigger(t)}),i.modal("show")}},p.prototype.hide=function(){this.getModal().modal("hide")},p.prototype.cleanModal=function(){this.$multiSelect.removeAttr("aria-describedby"),this.$modal.remove(),this.$modal=null},p.prototype.appendModal=function(){l("body").prepend(this.$modal)},p.prototype.addOption=function(t){var e=l("<option></option>",t),i=new p.Option(e,this.getOptionConfig()),n=null;n=l.Event("addingoption.bs."+this.type),this.$element.trigger(n,i),n.isDefaultPrevented()||(this.$element.append(e),this.$selectOptions.push(i),n=l.Event("optionadded.bs."+this.type),this.$element.trigger(n,i),e.prop("selected")&&this.optionSelected(i),this.modalShown&&this.getModalBody().html(this.getModalBodyContent()))},p.prototype.selectOption=function(t){var e=this.$element.find("option[value="+t+"]").data("multiselect.option");this.optionSelected(e)},p.prototype.deselectOption=function(t){var e=this.$element.find("option[value="+t+"]").data("multiselect.option");this.optionDeSelected(e)},p.prototype.enable=function(){if(!this.enabled){this.$multiSelect.removeClass("disabled"),this.$element.prop("disabled",!1),this.enabled=!0;var t=l.Event("enabled.bs."+this.type);this.$element.trigger(t)}},p.prototype.disable=function(){if(this.enabled){this.$multiSelect.addClass("disabled"),this.$element.prop("disabled",!0),this.enabled=!1;var t=l.Event("disabled.bs."+this.type);this.$element.trigger(t)}},p.prototype.optionSelected=function(t){var e=null;if(this.options.maxSelectionAllowed==this.getSelected().length)return e=l.Event("maxselected.bs."+this.type),this.$element.trigger(e,t),!0;e=l.Event("selected.bs."+this.type),this.$element.trigger(e,t),e.isDefaultPrevented()||(t.selected(),this._optionSelected(t),e=l.Event("selectiondone.bs."+this.type),this.$element.trigger(e,t),this.updateHelpText(t,e),this.postProcess())},p.prototype._optionSelected=function(t){var e=this,i=t.getContent();i.find(".removeOption").on("click",function(){e.optionDeSelected(t)}),this.getMultiSelectContent().append(i)},p.prototype.optionDeSelected=function(t){var e=l.Event("deselected.bs."+this.type);this.$element.trigger(e,t),e.isDefaultPrevented()||(t.deselected(),t.getContent().remove(),e=l.Event("deselectiondone.bs."+this.type),this.$element.trigger(e,t),this.updateHelpText(t,e),this.postProcess())},(p.Option=function(t,e){this.options=null,this.enabled=null,this.timeout=null,this.$element=null,this.type="multiselect.option",this.init(t,e)}).DEFAULTS={},p.Option.prototype.init=function(t,e){if(this.$element=l(t),this.enabled=this.isEnabled(),this.options=this.getOptions(e),!this.$element.is("option"))throw new Error("Popup MultiSelect Option only possible on option element.");this.$element.data(this.type,this),this.tip()},p.Option.prototype.tip=function(){this.$tip||(this.$tip=l(this.options.modalOptionTemplate),this.$tip.find(".option-text").html(this.$element.text()),this.enabled||this.$tip.addClass("disabled"),this.isSelected()&&this.selected())},p.Option.prototype.getDefaults=function(){return p.Option.DEFAULTS},p.Option.prototype.getOptions=function(t){return t=l.extend({},this.getDefaults(),this.$element.data(),t)},p.Option.prototype.isEnabled=function(){return!this.$element.prop("disabled")},p.Option.prototype.createModalOption=function(){return this.$tip.data(this.type,this),this.$tip},p.Option.prototype.isSelected=function(){return this.$element.prop("selected")},p.Option.prototype.selected=function(){this.$element.attr("selected","selected"),this.$tip.addClass("selected")},p.Option.prototype.deselected=function(){this.$element.removeAttr("selected"),this.$tip.removeClass("selected")},p.Option.prototype.getContent=function(){return this.$content||(this.$content=l(this.options.selectOptionTemplate),this.$content.find(".text").html(this.$element.html()),this.enabled||this.$content.addClass("disabled"),this.$content.data(this.type,this)),this.$content};var t=l.fn.multiselect;l.fn.multiselect=function(n){var o=Array.prototype.slice.call(arguments);return o.shift(),this.each(function(){var t=l(this),e=t.data("bs.multiselect"),i="object"==typeof n&&n;!e&&/destroy|hide/.test(n)||(e||(t=(e=new p(this,i)).$element).data("bs.multiselect",e),"string"==typeof n&&e[n].apply(e,o))})},l.fn.multiselect.Constructor=p,l.fn.multiselect.noConflict=function(){return l.fn.multiselect=t,this}}(jQuery);
\ No newline at end of file
diff --git a/dist/stylesheets/multiselect.css b/dist/stylesheets/multiselect.css
index f103722..6b18e9c 100644
--- a/dist/stylesheets/multiselect.css
+++ b/dist/stylesheets/multiselect.css
@@ -41,7 +41,7 @@
   color: #000;
   right: 0px;
 }
-.selectWrap > .open-options > span.glyphicon {
+.selectWrap > .open-options > span.icon {
   font-size: 14px;
 }
 .selectWrap.disabled > .open-options {
@@ -81,4 +81,11 @@
   cursor: pointer;
 }
 
+.icon {
+  display: inline-block;
+  font-style: normal;
+  font-weight: 400;
+  -webkit-font-smoothing: antialiased;
+}
+
 /*# sourceMappingURL=multiselect.css.map */
diff --git a/dist/stylesheets/multiselect.css.map b/dist/stylesheets/multiselect.css.map
index 3bf28cb..e14e67d 100644
--- a/dist/stylesheets/multiselect.css.map
+++ b/dist/stylesheets/multiselect.css.map
@@ -1,6 +1,6 @@
 {
 "version": 3,
-"mappings": "AAEI,oCAAS;EACP,KAAK,EAAE,OAAO;;AAIlB,yBAAY;EACV,UAAU,EAAE,KAAK;EACjB,UAAU,EAAE,MAAM;;AAElB,mCAAU;EACR,OAAO,EAAE,QAAQ;EACjB,MAAM,EAAE,QAAQ;;AAEhB,kDAAe;EACb,KAAK,EAAE,KAAK;EACZ,OAAO,EAAE,IAAI;;AAIjB,4CAAmB;EACjB,KAAK,EAAE,OAAO;;AAEd,2DAAe;EACb,OAAO,EAAE,KAAK;;;AAMtB,WAAY;EACV,OAAO,EAAE,KAAK;EACd,QAAQ,EAAE,QAAQ;EAClB,KAAK,EAAE,IAAI;EACX,MAAM,EAAE,IAAI;EACZ,UAAU,EAAE,IAAI;EAChB,OAAO,EAAE,QAAQ;EACjB,gBAAgB,EAAE,OAAO;EACzB,gBAAgB,EAAE,IAAI;EACtB,MAAM,EAAE,iBAAiB;EACzB,aAAa,EAAE,GAAG;EAClB,kBAAkB,EAAE,4DACU;EAC9B,aAAa,EAAE,4DAA4D;EAC3E,UAAU,EAAE,4DAA4D;;AAExE,2BAAgB;EACd,QAAQ,EAAE,QAAQ;EAClB,eAAe,EAAE,IAAI;EACrB,KAAK,EAAE,IAAI;EACX,KAAK,EAAE,GAAG;;AAEV,4CAAiB;EACf,SAAS,EAAE,IAAI;;AAInB,oCAA2B;EACzB,OAAO,EAAE,IAAI;;AAGf,6BAAkB;EAChB,OAAO,EAAE,KAAK;;AAEd,4CAAe;EACb,KAAK,EAAE,KAAK;EACZ,gBAAgB,EAAE,OAAO;EACzB,MAAM,EAAE,cAAc;EACtB,OAAO,EAAE,GAAG;EACZ,aAAa,EAAE,GAAG;EAClB,MAAM,EAAE,GAAG;EACX,KAAK,EAAE,IAAI;EACX,MAAM,EAAE,OAAO;;AAEf,oDAAQ;EACN,KAAK,EAAE,IAAI;;AAEb,4DAAgB;EACd,KAAK,EAAE,IAAI;EACX,WAAW,EAAE,IAAI;;AAMrB,qDAAe;EACb,MAAM,EAAE,WAAW;;AACnB,6DAAQ;EACN,KAAK,EAAE,IAAI;;AAGb,qEAAgB;EACd,OAAO,EAAE,IAAI;;;AAMrB,UAAW;EACT,MAAM,EAAE,OAAO",
+"mappings": "AAEI,oCAAS;EACP,KAAK,EAAE,OAAO;;AAIlB,yBAAY;EACV,UAAU,EAAE,KAAK;EACjB,UAAU,EAAE,MAAM;;AAElB,mCAAU;EACR,OAAO,EAAE,QAAQ;EACjB,MAAM,EAAE,QAAQ;;AAEhB,kDAAe;EACb,KAAK,EAAE,KAAK;EACZ,OAAO,EAAE,IAAI;;AAIjB,4CAAmB;EACjB,KAAK,EAAE,OAAO;;AAEd,2DAAe;EACb,OAAO,EAAE,KAAK;;;AAMtB,WAAY;EACV,OAAO,EAAE,KAAK;EACd,QAAQ,EAAE,QAAQ;EAClB,KAAK,EAAE,IAAI;EACX,MAAM,EAAE,IAAI;EACZ,UAAU,EAAE,IAAI;EAChB,OAAO,EAAE,QAAQ;EACjB,gBAAgB,EAAE,OAAO;EACzB,gBAAgB,EAAE,IAAI;EACtB,MAAM,EAAE,iBAAiB;EACzB,aAAa,EAAE,GAAG;EAClB,kBAAkB,EAAE,4DACU;EAC9B,aAAa,EAAE,4DAA4D;EAC3E,UAAU,EAAE,4DAA4D;;AAExE,2BAAgB;EACd,QAAQ,EAAE,QAAQ;EAClB,eAAe,EAAE,IAAI;EACrB,KAAK,EAAE,IAAI;EACX,KAAK,EAAE,GAAG;;AAEV,uCAAY;EACV,SAAS,EAAE,IAAI;;AAInB,oCAA2B;EACzB,OAAO,EAAE,IAAI;;AAGf,6BAAkB;EAChB,OAAO,EAAE,KAAK;;AAEd,4CAAe;EACb,KAAK,EAAE,KAAK;EACZ,gBAAgB,EAAE,OAAO;EACzB,MAAM,EAAE,cAAc;EACtB,OAAO,EAAE,GAAG;EACZ,aAAa,EAAE,GAAG;EAClB,MAAM,EAAE,GAAG;EACX,KAAK,EAAE,IAAI;EACX,MAAM,EAAE,OAAO;;AAEf,oDAAQ;EACN,KAAK,EAAE,IAAI;;AAEb,4DAAgB;EACd,KAAK,EAAE,IAAI;EACX,WAAW,EAAE,IAAI;;AAMrB,qDAAe;EACb,MAAM,EAAE,WAAW;;AACnB,6DAAQ;EACN,KAAK,EAAE,IAAI;;AAGb,qEAAgB;EACd,OAAO,EAAE,IAAI;;;AAMrB,UAAW;EACT,MAAM,EAAE,OAAO;;;AAGjB,KAAM;EACJ,OAAO,EAAE,YAAY;EACrB,UAAU,EAAE,MAAM;EAClB,WAAW,EAAE,GAAG;EAChB,sBAAsB,EAAE,WAAW",
 "sources": ["../../src/stylesheets/multiselect.scss"],
 "names": [],
 "file": "multiselect.css"
diff --git a/dist/stylesheets/multiselect.min.css b/dist/stylesheets/multiselect.min.css
index ab338a5..99eb80f 100644
--- a/dist/stylesheets/multiselect.min.css
+++ b/dist/stylesheets/multiselect.min.css
@@ -1 +1 @@
-.select.modal .modal-header>.close{color:#000}.select.modal .modal-body{max-height:500px;overflow-y:scroll}.select.modal .modal-body>.option{padding:15px 0;margin:0 15px}.select.modal .modal-body>.option>.option-tick{float:right;display:none}.select.modal .modal-body>.option.selected{color:#fc5510}.select.modal .modal-body>.option.selected>.option-tick{display:block}.selectWrap{display:block;position:relative;width:100%;height:auto;min-height:48px;padding:6px 12px;background-color:#fbfbfb;background-image:none;border:1px solid #e8e8e8;border-radius:3px;-webkit-transition:border-color ease-in-out .15s,box-shadow ease-in-out .15s;-o-transition:border-color ease-in-out .15s,box-shadow ease-in-out .15s;transition:border-color ease-in-out .15s,box-shadow ease-in-out .15s}.selectWrap>.open-options{position:absolute;text-decoration:none;color:#000;right:0}.selectWrap>.open-options>span.glyphicon{font-size:14px}.selectWrap.disabled>.open-options{display:none}.selectWrap>.select-content{display:block}.selectWrap>.select-content>.addedOption{color:#fff;background-color:#fff;border:1px solid #333;padding:5px;border-radius:3px;margin:2px;float:left;cursor:pointer}.selectWrap>.select-content>.addedOption>.text{color:#333}.selectWrap>.select-content>.addedOption>.removeOption{color:#aaa;margin-left:10px}.selectWrap.disabled>.select-content>.addedOption{cursor:not-allowed}.selectWrap.disabled>.select-content>.addedOption>.text{color:#999}.selectWrap.disabled>.select-content>.addedOption>.removeOption{display:none}.clickable{cursor:pointer}
\ No newline at end of file
+.select.modal .modal-header>.close{color:#000}.select.modal .modal-body{max-height:500px;overflow-y:scroll}.select.modal .modal-body>.option{padding:15px 0;margin:0 15px}.select.modal .modal-body>.option>.option-tick{float:right;display:none}.select.modal .modal-body>.option.selected{color:#fc5510}.select.modal .modal-body>.option.selected>.option-tick{display:block}.selectWrap{display:block;position:relative;width:100%;height:auto;min-height:48px;padding:6px 12px;background-color:#fbfbfb;background-image:none;border:1px solid #e8e8e8;border-radius:3px;-webkit-transition:border-color ease-in-out .15s,box-shadow ease-in-out .15s;-o-transition:border-color ease-in-out .15s,box-shadow ease-in-out .15s;transition:border-color ease-in-out .15s,box-shadow ease-in-out .15s}.selectWrap>.open-options{position:absolute;text-decoration:none;color:#000;right:0}.selectWrap>.open-options>span.icon{font-size:14px}.selectWrap.disabled>.open-options{display:none}.selectWrap>.select-content{display:block}.selectWrap>.select-content>.addedOption{color:#fff;background-color:#fff;border:1px solid #333;padding:5px;border-radius:3px;margin:2px;float:left;cursor:pointer}.selectWrap>.select-content>.addedOption>.text{color:#333}.selectWrap>.select-content>.addedOption>.removeOption{color:#aaa;margin-left:10px}.selectWrap.disabled>.select-content>.addedOption{cursor:not-allowed}.selectWrap.disabled>.select-content>.addedOption>.text{color:#999}.selectWrap.disabled>.select-content>.addedOption>.removeOption{display:none}.clickable{cursor:pointer}.icon{display:inline-block;font-style:normal;font-weight:400;-webkit-font-smoothing:antialiased}
\ No newline at end of file
diff --git a/examples/index.html b/examples/index.html
index c877b7b..a8cfd23 100644
--- a/examples/index.html
+++ b/examples/index.html
@@ -187,7 +187,8 @@ <h4>Basic Example (Disabled)</h4>
   $(document).ready(function() {
     $("#industries1").multiselect({
       title: "Select Industry",
-      maxSelectionAllowed: 5
+      maxSelectionAllowed: 5,
+      modalSize: "md"
     });
     $("#industries2").multiselect({
       title: "Select Industry",
diff --git a/package.json b/package.json
index a8d34a1..620fd75 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "popup-multiselect",
   "description": "Popup Multi Select Widget based on Bootstrap.",
-  "version": "2.0.1",
+  "version": "2.1.0",
   "private": false,
   "homepage": "https://github.com/harshniketseta/popupMultiSelect",
   "author": {
@@ -21,7 +21,7 @@
     "grunt-contrib-watch": "^1.1.0"
   },
   "dependencies": {
-    "bootstrap": "~3.3.2",
-    "jquery": "~2.1.3"
+    "bootstrap": ">=3.4.1",
+    "jquery": ">=3.4.0"
   }
 }
diff --git a/src/javascripts/multiselect.js b/src/javascripts/multiselect.js
index 8771997..3dcc4f8 100644
--- a/src/javascripts/multiselect.js
+++ b/src/javascripts/multiselect.js
@@ -4,7 +4,7 @@
  * Popup Multi Select
  * Created By Harshniket Seta
  * Currently maintained by harshniketseta [at] gmail [dot] com
- * Version: 2.0.1
+ * Version: 2.1.0
  * Release: 2019-05-26
  * ======================================================================== */
 
@@ -32,14 +32,15 @@
 
   MultiSelect.DEFAULTS = {
     animation: true,
+    modalSize: "sm",
     selectTemplate:
-      '<div class="selectWrap clearfix"><span class="select-content"></span><a href="#" class="open-options clickable"><span class="glyphicon glyphicon-list" aria-hidden="true"></span></a></div>',
+      '<div class="selectWrap clearfix"><span class="select-content"></span><a href="#" class="open-options clickable"><span class="icon icon-list">&#9776;</span></a></div>',
     selectOptionTemplate:
-      '<span class="addedOption" ><span class="text"></span><span class="clickable removeOption"><span class="glyphicon glyphicon-remove" aria-hidden="true"></span></span></span>',
+      '<span class="addedOption" ><span class="text"></span><span class="clickable removeOption"><span class="icon icon-remove" aria-hidden="true"></span></span></span>',
     modalTemplate:
-      '<div class="select modal in" aria-hidden="false"><div class="modal-dialog modal-sm"><div class="modal-content"><div class="modal-header"><span class="pull-right clickable close" aria-hidden="true">x</span><h4 class="modal-title"></h4><div class="help-block"></div></div><div class="modal-body"></div></div></div></div>',
+      '<div class="select modal in" aria-hidden="false"><div class="modal-dialog"><div class="modal-content"><div class="modal-header"><div><h5 class="modal-title"></h5><div class="help-block"></div></div><span class="float-right clickable close" aria-hidden="true">x</span></div><div class="modal-body"></div></div></div></div>',
     modalOptionTemplate:
-      '<div class="option clickable"><span class="option-text"></span><span class="option-tick"><span class="glyphicon glyphicon-ok" aria-hidden="true"></span></span></div>',
+      '<div class="option clickable"><span class="option-text"></span><span class="option-tick"><span class="icon icon-ok" aria-hidden="true">&#x2713;</span></span></div>',
     title: "Select Options"
   };
 
@@ -116,6 +117,7 @@
     if (!this.multiple) {
       options.maxSelectionAllowed = 1;
     }
+
     return options;
   };
 
@@ -153,7 +155,7 @@
 
   MultiSelect.prototype.getSelectOpenIcon = function() {
     var $openOptions = this.getMultiSelectOpen(),
-      optionsOpenIcon = $openOptions.find("span.glyphicon");
+      optionsOpenIcon = $openOptions.find("span.icon");
     return optionsOpenIcon;
   };
 
@@ -181,6 +183,7 @@
       this.getModalHelpBlock(this.$modal).html(this.getModalHelpTextContent());
       this.getModalTitleBlock(this.$modal).html(this.getModalTitle());
       this.getModalBody(this.$modal).html(this.getModalBodyContent());
+      this.getModalDialog(this.$modal).addClass(this.getModalSizeClass());
       this.initModal(this.$modal);
     }
 
@@ -209,6 +212,12 @@
     return $modal.find(".modal-body");
   };
 
+  MultiSelect.prototype.getModalDialog = function($modal) {
+    $modal = $modal || this.getModal();
+
+    return $modal.find(".modal-dialog");
+  };
+
   MultiSelect.prototype.getModalHelpTextContent = function(jOption, action) {
     var helpText = "",
       currentlySelectedLength = this.getSelected().length,
@@ -231,6 +240,10 @@
     return this.options.title;
   };
 
+  MultiSelect.prototype.getModalSizeClass = function() {
+    return "modal-" + this.options.modalSize;
+  };
+
   MultiSelect.prototype.getModalBodyContent = function() {
     var oMultiSelect = this,
       modalBodyContent = [];
diff --git a/src/stylesheets/multiselect.scss b/src/stylesheets/multiselect.scss
index 81d33c3..9e966ad 100644
--- a/src/stylesheets/multiselect.scss
+++ b/src/stylesheets/multiselect.scss
@@ -51,7 +51,7 @@
     color: #000;
     right: 0px;
 
-    > span.glyphicon {
+    > span.icon {
       font-size: 14px;
     }
   }
@@ -100,3 +100,10 @@
 .clickable {
   cursor: pointer;
 }
+
+.icon {
+  display: inline-block;
+  font-style: normal;
+  font-weight: 400;
+  -webkit-font-smoothing: antialiased;
+}
diff --git a/yarn.lock b/yarn.lock
index 8a81ef6..23920c4 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -78,10 +78,10 @@ body@^5.1.0:
     raw-body "~1.1.0"
     safe-json-parse "~1.0.1"
 
-bootstrap@~3.3.2:
-  version "3.3.7"
-  resolved "https://registry.yarnpkg.com/bootstrap/-/bootstrap-3.3.7.tgz#5a389394549f23330875a3b150656574f8a9eb71"
-  integrity sha1-WjiTlFSfIzMIdaOxUGVldPip63E=
+bootstrap@>=3.4.1:
+  version "4.3.1"
+  resolved "https://registry.yarnpkg.com/bootstrap/-/bootstrap-4.3.1.tgz#280ca8f610504d99d7b6b4bfc4b68cec601704ac"
+  integrity sha512-rXqOmH1VilAt2DyPzluTi2blhk17bO7ef+zLLPlWvG494pDxcM234pJ8wTc/6R40UWizAIIMgxjvxZg5kmsbag==
 
 brace-expansion@^1.1.7:
   version "1.1.11"
@@ -653,10 +653,10 @@ isexe@^2.0.0:
   resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10"
   integrity sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=
 
-jquery@~2.1.3:
-  version "2.1.4"
-  resolved "https://registry.yarnpkg.com/jquery/-/jquery-2.1.4.tgz#228bde698a0c61431dc2630a6a154f15890d2317"
-  integrity sha1-IoveaYoMYUMdwmMKahVPFYkNIxc=
+jquery@>=3.4.0:
+  version "3.4.1"
+  resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.4.1.tgz#714f1f8d9dde4bdfa55764ba37ef214630d80ef2"
+  integrity sha512-36+AdBzCL+y6qjw5Tx7HgzeGCzC81MDDgaUP8ld2zhx58HdqXGoBd+tHdrBMiyjGQs0Hxs/MLZTu/eHNJJuWPw==
 
 js-yaml@~3.13.0:
   version "3.13.1"