diff --git a/index.jsx b/index.jsx
index 35f3ae5..da8db5e 100644
--- a/index.jsx
+++ b/index.jsx
@@ -1,6 +1,14 @@
 const _debounce = require('lodash.debounce')
 const React = require('react')
 const onElementResize = require('element-resize-event')
+const unbind = require('element-resize-event').unbind
+
+const defaultContainerStyle = {
+  width: '100%',
+  height: '100%',
+  padding: 0,
+  border: 0
+}
 
 function defaultGetDimensions (element) {
   return [element.clientWidth, element.clientHeight]
@@ -73,11 +81,12 @@ function defaultGetDimensions (element) {
  * module.exports = Dimensions()(MyComponent) // Enhanced component
  *
  */
-module.exports = function Dimensions ({
+export default function Dimensions ({
     getDimensions = defaultGetDimensions,
     debounce = 0,
     debounceOpts = {},
-    elementResize = false
+    elementResize = false,
+    containerStyle = defaultContainerStyle
   } = {}) {
   return (ComposedComponent) => {
     return class DimensionsHOC extends React.Component {
@@ -139,9 +148,12 @@ module.exports = function Dimensions ({
       }
 
       componentWillUnmount () {
-        this.getWindow().removeEventListener('resize', this.onResize)
-        // TODO: remote element-resize-event listener.
-        // pending https://github.com/KyleAMathews/element-resize-event/issues/2
+        this._parent = this.refs.wrapper.parentNode
+        if (elementResize) {
+          unbind(this._parent)
+        } else {
+          this.getWindow().removeEventListener('resize', this.onResize)
+        }
       }
 
       /**
@@ -161,20 +173,17 @@ module.exports = function Dimensions ({
           // only trigger a warning about the wrapper div if we already have a reference to it
           console.warn('Wrapper div has no height or width, try overriding style with `containerStyle` option')
         }
-        const wrapperStyle = {
-          overflow: 'visible',
-          height: 0,
-          width: 0
-        }
+
         return (
-          <div style={wrapperStyle} ref='wrapper'>
-            {(containerWidth || containerHeight) &&
-              <ComposedComponent
+          <div style={containerStyle} ref='wrapper'>
+            {(containerWidth || containerHeight)
+              ? <ComposedComponent
                 {...this.state}
                 {...this.props}
                 updateDimensions={this.updateDimensions}
                 ref='wrappedInstance'
-              />
+               />
+              : null
             }
           </div>
         )
diff --git a/package.json b/package.json
index 5899abb..0cab422 100644
--- a/package.json
+++ b/package.json
@@ -49,7 +49,7 @@
     "react-dom": "^0.14.0 || ^15.0.0"
   },
   "dependencies": {
-    "element-resize-event": "^2.0.4",
+    "element-resize-event": "^2.0.8",
     "lodash.debounce": "^4.0.6"
   }
 }