diff --git a/dist/leaflet.groupedlayercontrol.min.js b/dist/leaflet.groupedlayercontrol.min.js
index a6693f9..e50ee4f 100644
--- a/dist/leaflet.groupedlayercontrol.min.js
+++ b/dist/leaflet.groupedlayercontrol.min.js
@@ -1,5 +1,5 @@
 /*! Version: 0.6.1
-Date: 2018-04-30 */
+Date: 2018-07-06 */
 
-L.Control.GroupedLayers=L.Control.extend({options:{collapsed:!0,position:"topright",autoZIndex:!0,exclusiveGroups:[],groupCheckboxes:!1},initialize:function(a,b,c){var d,e;L.Util.setOptions(this,c),this._layers=[],this._lastZIndex=0,this._handlingClick=!1,this._groupList=[],this._domGroups=[];for(d in a)this._addLayer(a[d],d);for(d in b)for(e in b[d])this._addLayer(b[d][e],e,d,!0)},onAdd:function(a){return this._initLayout(),this._update(),a.on("layeradd",this._onLayerChange,this).on("layerremove",this._onLayerChange,this),this._container},onRemove:function(a){a.off("layeradd",this._onLayerChange,this).off("layerremove",this._onLayerChange,this)},addBaseLayer:function(a,b){return this._addLayer(a,b),this._update(),this},addOverlay:function(a,b,c){return this._addLayer(a,b,c,!0),this._update(),this},removeLayer:function(a){var b=L.Util.stamp(a),c=this._getLayer(b);return c&&delete this._layers[this._layers.indexOf(c)],this._update(),this},_getLayer:function(a){for(var b=0;b<this._layers.length;b++)if(this._layers[b]&&L.stamp(this._layers[b].layer)===a)return this._layers[b]},_initLayout:function(){var a="leaflet-control-layers",b=this._container=L.DomUtil.create("div",a);b.setAttribute("aria-haspopup",!0),L.Browser.touch?L.DomEvent.on(b,"click",L.DomEvent.stopPropagation):(L.DomEvent.disableClickPropagation(b),L.DomEvent.on(b,"wheel",L.DomEvent.stopPropagation));var c=this._form=L.DomUtil.create("form",a+"-list");if(this.options.collapsed){L.Browser.android||L.DomEvent.on(b,"mouseover",this._expand,this).on(b,"mouseout",this._collapse,this);var d=this._layersLink=L.DomUtil.create("a",a+"-toggle",b);d.href="#",d.title="Layers",L.Browser.touch?L.DomEvent.on(d,"click",L.DomEvent.stop).on(d,"click",this._expand,this):L.DomEvent.on(d,"focus",this._expand,this),this._map.on("click",this._collapse,this)}else this._expand();this._baseLayersList=L.DomUtil.create("div",a+"-base",c),this._separator=L.DomUtil.create("div",a+"-separator",c),this._overlaysList=L.DomUtil.create("div",a+"-overlays",c),b.appendChild(c)},_addLayer:function(a,b,c,d){var e=(L.Util.stamp(a),{layer:a,name:b,overlay:d});this._layers.push(e),c=c||"";var f=this._indexOf(this._groupList,c);-1===f&&(f=this._groupList.push(c)-1);var g=-1!==this._indexOf(this.options.exclusiveGroups,c);e.group={name:c,id:f,exclusive:g},this.options.autoZIndex&&a.setZIndex&&(this._lastZIndex++,a.setZIndex(this._lastZIndex))},_update:function(){if(this._container){this._baseLayersList.innerHTML="",this._overlaysList.innerHTML="",this._domGroups.length=0;for(var a,b,c=!1,d=!1,a=0;a<this._layers.length;a++)b=this._layers[a],this._addItem(b),d=d||b.overlay,c=c||!b.overlay;this._separator.style.display=d&&c?"":"none"}},_onLayerChange:function(a){var b,c=this._getLayer(L.Util.stamp(a.layer));c&&(this._handlingClick||this._update(),b=c.overlay?"layeradd"===a.type?"overlayadd":"overlayremove":"layeradd"===a.type?"baselayerchange":null,b&&this._map.fire(b,c))},_createRadioElement:function(a,b){var c='<input type="radio" class="leaflet-control-layers-selector" name="'+a+'"';b&&(c+=' checked="checked"'),c+="/>";var d=document.createElement("div");return d.innerHTML=c,d.firstChild},_addItem:function(a){var b,c,d,e=document.createElement("label"),f=this._map.hasLayer(a.layer);a.overlay?a.group.exclusive?(d="leaflet-exclusive-group-layer-"+a.group.id,b=this._createRadioElement(d,f)):(b=document.createElement("input"),b.type="checkbox",b.className="leaflet-control-layers-selector",b.defaultChecked=f):b=this._createRadioElement("leaflet-base-layers",f),b.layerId=L.Util.stamp(a.layer),b.groupID=a.group.id,L.DomEvent.on(b,"click",this._onInputClick,this);var g=document.createElement("span");if(g.innerHTML=" "+a.name,e.appendChild(b),e.appendChild(g),a.overlay){c=this._overlaysList;var h=this._domGroups[a.group.id];if(!h){h=document.createElement("div"),h.className="leaflet-control-layers-group",h.id="leaflet-control-layers-group-"+a.group.id;var i=document.createElement("label");if(i.className="leaflet-control-layers-group-label",""!==a.group.name&&!a.group.exclusive&&this.options.groupCheckboxes){var j=document.createElement("input");j.type="checkbox",j.className="leaflet-control-layers-group-selector",j.groupID=a.group.id,j.legend=this,L.DomEvent.on(j,"click",this._onGroupInputClick,j),i.appendChild(j)}var k=document.createElement("span");k.className="leaflet-control-layers-group-name",k.innerHTML=a.group.name,i.appendChild(k),h.appendChild(i),c.appendChild(h),this._domGroups[a.group.id]=h}c=h}else c=this._baseLayersList;return c.appendChild(e),e},_onGroupInputClick:function(){var a,b,c,d=this.legend;d._handlingClick=!0;var e=d._form.getElementsByTagName("input"),f=e.length;for(a=0;f>a;a++)b=e[a],b.groupID===this.groupID&&"leaflet-control-layers-selector"===b.className&&(b.checked=this.checked,c=d._getLayer(b.layerId),b.checked&&!d._map.hasLayer(c.layer)?d._map.addLayer(c.layer):!b.checked&&d._map.hasLayer(c.layer)&&d._map.removeLayer(c.layer));d._handlingClick=!1},_onInputClick:function(){var a,b,c,d=this._form.getElementsByTagName("input"),e=d.length;for(this._handlingClick=!0,a=0;e>a;a++)b=d[a],"leaflet-control-layers-selector"===b.className&&(c=this._getLayer(b.layerId),b.checked&&!this._map.hasLayer(c.layer)?this._map.addLayer(c.layer):!b.checked&&this._map.hasLayer(c.layer)&&this._map.removeLayer(c.layer));this._handlingClick=!1},_expand:function(){L.DomUtil.addClass(this._container,"leaflet-control-layers-expanded");var a=this._map._size.y-4*this._container.offsetTop;a<this._form.clientHeight&&(L.DomUtil.addClass(this._form,"leaflet-control-layers-scrollbar"),this._form.style.height=a+"px")},_collapse:function(){this._container.className=this._container.className.replace(" leaflet-control-layers-expanded","")},_indexOf:function(a,b){for(var c=0,d=a.length;d>c;c++)if(a[c]===b)return c;return-1}}),L.control.groupedLayers=function(a,b,c){return new L.Control.GroupedLayers(a,b,c)};
+L.Control.GroupedLayers=L.Control.extend({options:{collapsed:!0,position:"topright",autoZIndex:!0,exclusiveGroups:[],groupCheckboxes:!1},initialize:function(a,b,c){var d,e;L.Util.setOptions(this,c),this._layers=[],this._lastZIndex=0,this._handlingClick=!1,this._groupList=[],this._domGroups=[];for(d in a)this._addLayer(a[d],d);for(d in b)for(e in b[d])this._addLayer(b[d][e],e,d,!0)},onAdd:function(a){return this._initLayout(),this._update(),a.on("layeradd",this._onLayerChange,this).on("layerremove",this._onLayerChange,this),this._container},addTo:function(a){return L.Control.prototype.addTo.call(this,a),this._expandIfNotCollapsed()},onRemove:function(a){a.off("layeradd",this._onLayerChange,this).off("layerremove",this._onLayerChange,this)},addBaseLayer:function(a,b){return this._addLayer(a,b),this._update(),this},addOverlay:function(a,b,c){return this._addLayer(a,b,c,!0),this._update(),this},removeLayer:function(a){var b=L.Util.stamp(a),c=this._getLayer(b);return c&&this._layers.splice(this._layers.indexOf(c),1),this._update(),this},_getLayer:function(a){for(var b=0;b<this._layers.length;b++)if(this._layers[b]&&L.stamp(this._layers[b].layer)===a)return this._layers[b]},_initLayout:function(){var a="leaflet-control-layers",b=this._container=L.DomUtil.create("div",a),c=this.options.collapsed;b.setAttribute("aria-haspopup",!0),L.DomEvent.disableClickPropagation(b),L.DomEvent.disableScrollPropagation(b);var d=this._form=L.DomUtil.create("form",a+"-list");c&&(this._map.on("click",this._collapse,this),L.Browser.android||L.DomEvent.on(b,{mouseenter:this._expand,mouseleave:this._collapse},this));var e=this._layersLink=L.DomUtil.create("a",a+"-toggle",b);e.href="#",e.title="Layers",L.Browser.touch?(L.DomEvent.on(e,"click",L.DomEvent.stop),L.DomEvent.on(e,"click",this._expand,this)):L.DomEvent.on(e,"focus",this._expand,this),c||this._expand(),this._baseLayersList=L.DomUtil.create("div",a+"-base",d),this._separator=L.DomUtil.create("div",a+"-separator",d),this._overlaysList=L.DomUtil.create("div",a+"-overlays",d),b.appendChild(d)},_addLayer:function(a,b,c,d){var e=(L.Util.stamp(a),{layer:a,name:b,overlay:d});this._layers.push(e),c=c||"";var f=this._indexOf(this._groupList,c);-1===f&&(f=this._groupList.push(c)-1);var g=-1!==this._indexOf(this.options.exclusiveGroups,c);e.group={name:c,id:f,exclusive:g},this.options.autoZIndex&&a.setZIndex&&(this._lastZIndex++,a.setZIndex(this._lastZIndex)),this._expandIfNotCollapsed()},_update:function(){if(this._container){this._baseLayersList.innerHTML="",this._overlaysList.innerHTML="",this._domGroups.length=0;for(var a,b,c=!1,d=!1,a=0;a<this._layers.length;a++)b=this._layers[a],this._addItem(b),d=d||b.overlay,c=c||!b.overlay;this._separator.style.display=d&&c?"":"none"}},_onLayerChange:function(a){var b,c=this._getLayer(L.Util.stamp(a.layer));c&&(this._handlingClick||this._update(),b=c.overlay?"layeradd"===a.type?"overlayadd":"overlayremove":"layeradd"===a.type?"baselayerchange":null,b&&this._map.fire(b,c))},_createRadioElement:function(a,b){var c='<input type="radio" class="leaflet-control-layers-selector" name="'+a+'"';b&&(c+=' checked="checked"'),c+="/>";var d=document.createElement("div");return d.innerHTML=c,d.firstChild},_addItem:function(a){var b,c,d,e=document.createElement("label"),f=this._map.hasLayer(a.layer);a.overlay?a.group.exclusive?(d="leaflet-exclusive-group-layer-"+a.group.id,b=this._createRadioElement(d,f)):(b=document.createElement("input"),b.type="checkbox",b.className="leaflet-control-layers-selector",b.defaultChecked=f):b=this._createRadioElement("leaflet-base-layers",f),b.layerId=L.Util.stamp(a.layer),b.groupID=a.group.id,L.DomEvent.on(b,"click",this._onInputClick,this);var g=document.createElement("span");if(g.innerHTML=" "+a.name,e.appendChild(b),e.appendChild(g),a.overlay){c=this._overlaysList;var h=this._domGroups[a.group.id];if(!h){h=document.createElement("div"),h.className="leaflet-control-layers-group",h.id="leaflet-control-layers-group-"+a.group.id;var i=document.createElement("label");if(i.className="leaflet-control-layers-group-label",""!==a.group.name&&!a.group.exclusive&&this.options.groupCheckboxes){var j=document.createElement("input");j.type="checkbox",j.className="leaflet-control-layers-group-selector",j.groupID=a.group.id,j.legend=this,L.DomEvent.on(j,"click",this._onGroupInputClick,j),i.appendChild(j)}var k=document.createElement("span");k.className="leaflet-control-layers-group-name",k.innerHTML=a.group.name,i.appendChild(k),h.appendChild(i),c.appendChild(h),this._domGroups[a.group.id]=h}c=h}else c=this._baseLayersList;return c.appendChild(e),e},_onGroupInputClick:function(){var a,b,c,d=this.legend;d._handlingClick=!0;var e=d._form.getElementsByTagName("input"),f=e.length;for(a=0;f>a;a++)b=e[a],b.groupID===this.groupID&&"leaflet-control-layers-selector"===b.className&&(b.checked=this.checked,c=d._getLayer(b.layerId),b.checked&&!d._map.hasLayer(c.layer)?d._map.addLayer(c.layer):!b.checked&&d._map.hasLayer(c.layer)&&d._map.removeLayer(c.layer));d._handlingClick=!1},_onInputClick:function(){var a,b,c,d=this._form.getElementsByTagName("input"),e=d.length;for(this._handlingClick=!0,a=0;e>a;a++)b=d[a],"leaflet-control-layers-selector"===b.className&&(c=this._getLayer(b.layerId),b.checked&&!this._map.hasLayer(c.layer)?this._map.addLayer(c.layer):!b.checked&&this._map.hasLayer(c.layer)&&this._map.removeLayer(c.layer));this._handlingClick=!1},_expand:function(){L.DomUtil.addClass(this._container,"leaflet-control-layers-expanded"),this._form.style.height=null;var a=this._map.getSize().y-(this._container.offsetTop+50);return a<this._form.clientHeight?(L.DomUtil.addClass(this._form,"leaflet-control-layers-scrollbar"),this._form.style.height=a+"px"):L.DomUtil.removeClass(this._form,"leaflet-control-layers-scrollbar"),this},_expandIfNotCollapsed:function(){return this._map&&!this.options.collapsed&&this._expand(),this},_collapse:function(){this._container.className=this._container.className.replace(" leaflet-control-layers-expanded","")},_indexOf:function(a,b){for(var c=0,d=a.length;d>c;c++)if(a[c]===b)return c;return-1}}),L.control.groupedLayers=function(a,b,c){return new L.Control.GroupedLayers(a,b,c)};
 //# sourceMappingURL=leaflet.groupedlayercontrol.min.js.map
\ No newline at end of file
diff --git a/dist/leaflet.groupedlayercontrol.min.js.map b/dist/leaflet.groupedlayercontrol.min.js.map
index 5bbb028..53294bb 100644
--- a/dist/leaflet.groupedlayercontrol.min.js.map
+++ b/dist/leaflet.groupedlayercontrol.min.js.map
@@ -1 +1 @@
-{"version":3,"file":"leaflet.groupedlayercontrol.min.js","sources":["../src/leaflet.groupedlayercontrol.js"],"names":["L","Control","GroupedLayers","extend","options","collapsed","position","autoZIndex","exclusiveGroups","groupCheckboxes","initialize","baseLayers","groupedOverlays","i","j","Util","setOptions","this","_layers","_lastZIndex","_handlingClick","_groupList","_domGroups","_addLayer","onAdd","map","_initLayout","_update","on","_onLayerChange","_container","onRemove","off","addBaseLayer","layer","name","addOverlay","group","removeLayer","id","stamp","_layer","_getLayer","indexOf","length","className","container","DomUtil","create","setAttribute","Browser","touch","DomEvent","stopPropagation","disableClickPropagation","form","_form","android","_expand","_collapse","link","_layersLink","href","title","stop","_map","_baseLayersList","_separator","_overlaysList","appendChild","overlay","push","groupId","_indexOf","exclusive","setZIndex","innerHTML","obj","baseLayersPresent","overlaysPresent","_addItem","style","display","e","type","fire","_createRadioElement","checked","radioHtml","radioFragment","document","createElement","firstChild","input","groupRadioName","label","hasLayer","defaultChecked","layerId","groupID","_onInputClick","groupContainer","groupLabel","groupInput","legend","_onGroupInputClick","groupName","this_legend","inputs","getElementsByTagName","inputsLen","addLayer","addClass","acceptableHeight","_size","y","offsetTop","clientHeight","height","replace","arr","control","groupedLayers"],"mappings":"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"}
\ No newline at end of file
+{"version":3,"file":"leaflet.groupedlayercontrol.min.js","sources":["../src/leaflet.groupedlayercontrol.js"],"names":["L","Control","GroupedLayers","extend","options","collapsed","position","autoZIndex","exclusiveGroups","groupCheckboxes","initialize","baseLayers","groupedOverlays","i","j","Util","setOptions","this","_layers","_lastZIndex","_handlingClick","_groupList","_domGroups","_addLayer","onAdd","map","_initLayout","_update","on","_onLayerChange","_container","addTo","prototype","call","_expandIfNotCollapsed","onRemove","off","addBaseLayer","layer","name","addOverlay","group","removeLayer","id","stamp","_layer","_getLayer","splice","indexOf","length","className","container","DomUtil","create","setAttribute","DomEvent","disableClickPropagation","disableScrollPropagation","form","_form","_map","_collapse","Browser","android","mouseenter","_expand","mouseleave","link","_layersLink","href","title","touch","stop","_baseLayersList","_separator","_overlaysList","appendChild","overlay","push","groupId","_indexOf","exclusive","setZIndex","innerHTML","obj","baseLayersPresent","overlaysPresent","_addItem","style","display","e","type","fire","_createRadioElement","checked","radioHtml","radioFragment","document","createElement","firstChild","input","groupRadioName","label","hasLayer","defaultChecked","layerId","groupID","_onInputClick","groupContainer","groupLabel","groupInput","legend","_onGroupInputClick","groupName","this_legend","inputs","getElementsByTagName","inputsLen","addLayer","addClass","height","acceptableHeight","getSize","y","offsetTop","clientHeight","removeClass","replace","arr","control","groupedLayers"],"mappings":"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"}
\ No newline at end of file
diff --git a/src/leaflet.groupedlayercontrol.js b/src/leaflet.groupedlayercontrol.js
index b1e80d1..28eee08 100644
--- a/src/leaflet.groupedlayercontrol.js
+++ b/src/leaflet.groupedlayercontrol.js
@@ -44,6 +44,12 @@ L.Control.GroupedLayers = L.Control.extend({
     return this._container;
   },
 
+  addTo: function (map) {
+		L.Control.prototype.addTo.call(this, map);
+		// Trigger expand after Layers Control has been inserted into DOM so that is now has an actual height.
+		return this._expandIfNotCollapsed();
+	},
+
   onRemove: function (map) {
     map
         .off('layeradd', this._onLayerChange, this)
@@ -66,7 +72,7 @@ L.Control.GroupedLayers = L.Control.extend({
     var id = L.Util.stamp(layer);
     var _layer = this._getLayer(id);
     if (_layer) {
-      delete this._layers[this._layers.indexOf(_layer)];
+      this._layers.splice(this._layers.indexOf(_layer), 1);
     }
     this._update();
     return this;
@@ -82,41 +88,40 @@ L.Control.GroupedLayers = L.Control.extend({
 
   _initLayout: function () {
     var className = 'leaflet-control-layers',
-      container = this._container = L.DomUtil.create('div', className);
+      container = this._container = L.DomUtil.create('div', className),
+      collapsed = this.options.collapsed;
 
     // Makes this work on IE10 Touch devices by stopping it from firing a mouseout event when the touch is released
     container.setAttribute('aria-haspopup', true);
 
-    if (L.Browser.touch) {
-      L.DomEvent.on(container, 'click', L.DomEvent.stopPropagation);
-    } else {
-      L.DomEvent.disableClickPropagation(container);
-      L.DomEvent.on(container, 'wheel', L.DomEvent.stopPropagation);
-    }
+    L.DomEvent.disableClickPropagation(container);
+    L.DomEvent.disableScrollPropagation(container);
 
     var form = this._form = L.DomUtil.create('form', className + '-list');
 
-    if (this.options.collapsed) {
+    if (collapsed) {
+      this._map.on('click', this._collapse, this);
+
       if (!L.Browser.android) {
-        L.DomEvent
-            .on(container, 'mouseover', this._expand, this)
-            .on(container, 'mouseout', this._collapse, this);
-      }
-      var link = this._layersLink = L.DomUtil.create('a', className + '-toggle', container);
-      link.href = '#';
-      link.title = 'Layers';
-
-      if (L.Browser.touch) {
-        L.DomEvent
-            .on(link, 'click', L.DomEvent.stop)
-            .on(link, 'click', this._expand, this);
-      } else {
-        L.DomEvent.on(link, 'focus', this._expand, this);
+        L.DomEvent.on(container, {
+          mouseenter: this._expand,
+          mouseleave: this._collapse
+        }, this);
       }
+    }
 
-      this._map.on('click', this._collapse, this);
-      // TODO keyboard accessibility
+    var link = this._layersLink = L.DomUtil.create('a', className + '-toggle', container);
+    link.href = '#';
+    link.title = 'Layers';
+
+    if (L.Browser.touch) {
+      L.DomEvent.on(link, 'click', L.DomEvent.stop);
+      L.DomEvent.on(link, 'click', this._expand, this);
     } else {
+      L.DomEvent.on(link, 'focus', this._expand, this);
+    }
+
+    if (!collapsed) {
       this._expand();
     }
 
@@ -156,6 +161,8 @@ L.Control.GroupedLayers = L.Control.extend({
       this._lastZIndex++;
       layer.setZIndex(this._lastZIndex);
     }
+
+    this._expandIfNotCollapsed();
   },
 
   _update: function () {
@@ -347,12 +354,23 @@ L.Control.GroupedLayers = L.Control.extend({
 
   _expand: function () {
     L.DomUtil.addClass(this._container, 'leaflet-control-layers-expanded');
-    // permits to have a scrollbar if overlays heighter than the map.
-    var acceptableHeight = this._map._size.y - (this._container.offsetTop * 4);
+    this._form.style.height = null;
+    var acceptableHeight = this._map.getSize().y - (this._container.offsetTop + 50);
     if (acceptableHeight < this._form.clientHeight) {
       L.DomUtil.addClass(this._form, 'leaflet-control-layers-scrollbar');
       this._form.style.height = acceptableHeight + 'px';
+    } else {
+      L.DomUtil.removeClass(this._form, 'leaflet-control-layers-scrollbar');
     }
+    // this._checkDisabledLayers();
+    return this;
+  },
+
+  _expandIfNotCollapsed: function () {
+    if (this._map && !this.options.collapsed) {
+      this._expand();
+    }
+    return this;
   },
 
   _collapse: function () {