diff --git a/dist/sticky.compile.js b/dist/sticky.compile.js
index 245dbef..7c8bc68 100644
--- a/dist/sticky.compile.js
+++ b/dist/sticky.compile.js
@@ -5,10 +5,10 @@ var _createClass = function () { function defineProperties(target, props) { for
 function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
 
 var Sticky = function () {
-  function Sticky(element) {
+  function Sticky(selector) {
     _classCallCheck(this, Sticky);
 
-    this.element = element;
+    this.selector = selector;
 
     this.vp = this.getViewportSize();
     this.scrollTop = this.getScrollTopPosition();
@@ -21,17 +21,18 @@ var Sticky = function () {
     value: function initialize() {
       var _this = this;
 
-      var stickyElements = document.querySelectorAll(this.element);
+      this.elements = document.querySelectorAll(this.selector);
 
-      var _loop = function _loop(i, len) {
-        window.addEventListener('load', function () {
-          return _this.activate(stickyElements[i]);
-        });
-      };
+      // initialize sticky only when dom is fully loaded
+      var DOMContentLoaded = setInterval(function () {
+        if (document.readyState === 'interactive' || document.readyState === 'complete') {
+          for (var i = 0, len = _this.elements.length; i < len; i++) {
+            _this.activate(_this.elements[i]);
+          }
 
-      for (var i = 0, len = stickyElements.length; i < len; i++) {
-        _loop(i, len);
-      }
+          clearInterval(DOMContentLoaded);
+        }
+      }, 100);
     }
   }, {
     key: 'activate',
@@ -43,6 +44,13 @@ var Sticky = function () {
       el.sticky.marginTop = el.getAttribute('data-margin-top') ? parseInt(el.getAttribute('data-margin-top')) : 0;
       el.sticky.rect = this.getRect(el);
 
+      // fix when el is image that has not yet loaded and width, height = 0
+      if (el.tagName.toLowerCase() === 'img') {
+        el.onload = function () {
+          return el.sticky.rect = _this2.getRect(el);
+        };
+      }
+
       el.sticky.container = this.getContainer(el);
       el.sticky.container.rect = this.getRect(el.sticky.container);
 
@@ -145,6 +153,14 @@ var Sticky = function () {
         this.removeStyle(el, ['position', 'width', 'top', 'left', 'right', 'bottom']);
       }
     }
+  }, {
+    key: 'update',
+    value: function update() {
+      for (var i = 0, len = this.elements.length; i < len; i++) {
+        this.updateRect(this.elements[i]);
+        this.setPosition(this.elements[i]);
+      }
+    }
   }, {
     key: 'addStyle',
     value: function addStyle(el, styles) {
diff --git a/dist/sticky.min.js b/dist/sticky.min.js
index 9a0ceb3..9a3e7d3 100644
--- a/dist/sticky.min.js
+++ b/dist/sticky.min.js
@@ -1 +1 @@
-"use strict";function _classCallCheck(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}var _createClass=function(){function t(t,e){for(var i=0;i<e.length;i++){var o=e[i];o.enumerable=o.enumerable||!1,o.configurable=!0,"value"in o&&(o.writable=!0),Object.defineProperty(t,o.key,o)}}return function(e,i,o){return i&&t(e.prototype,i),o&&t(e,o),e}}(),Sticky=function(){function t(e){_classCallCheck(this,t),this.element=e,this.vp=this.getViewportSize(),this.scrollTop=this.getScrollTopPosition(),this.initialize()}return _createClass(t,[{key:"initialize",value:function(){for(var t=this,e=document.querySelectorAll(this.element),i=function(i,o){window.addEventListener("load",function(){return t.activate(e[i])})},o=0,n=e.length;o<n;o++)i(o,n)}},{key:"activate",value:function(t){var e=this;t.sticky={},t.sticky.marginTop=t.getAttribute("data-margin-top")?parseInt(t.getAttribute("data-margin-top")):0,t.sticky.rect=this.getRect(t),t.sticky.container=this.getContainer(t),t.sticky.container.rect=this.getRect(t.sticky.container),window.addEventListener("resize",function(){e.vp=e.getViewportSize(),e.updateRect(t),e.setPosition(t)}),window.addEventListener("scroll",function(){return e.scrollTop=e.getScrollTopPosition()}),window.addEventListener("scroll",function(){return e.setPosition(t)}),this.setPosition(t)}},{key:"getRect",value:function(t){var e=this.getTopLeftPosition(t);return e.offsetLeft=t.offsetLeft,e.width=t.offsetWidth,e.height=t.offsetHeight,e}},{key:"updateRect",value:function(t){this.removeStyle(t,["position","width","top","left","right","bottom"]),t.sticky.rect=this.getRect(t),t.sticky.container.rect=this.getRect(t.sticky.container)}},{key:"getTopLeftPosition",value:function(t){var e=0,i=0;do e+=t.offsetTop||0,i+=t.offsetLeft||0,t=t.offsetParent;while(t);return{top:e,left:i}}},{key:"getContainer",value:function(t){for(var e=t;"string"!=typeof e.getAttribute("data-sticky-container")&&e!==document.documentElement;)e=e.parentNode;return e}},{key:"getViewportSize",value:function(){return{width:Math.max(document.documentElement.clientWidth,window.innerWidth||0),height:Math.max(document.documentElement.clientHeight,window.innerHeight||0)}}},{key:"getScrollTopPosition",value:function(){return(window.pageYOffset||document.scrollTop)-(document.clientTop||0)||0}},{key:"setPosition",value:function(t){this.vp.height<t.sticky.rect.height||(this.removeStyle(t,["position","width","top","left","right","bottom"]),this.scrollTop>t.sticky.rect.top-t.sticky.marginTop?(this.addStyle(t,{position:"fixed",width:t.sticky.rect.width+"px",left:t.sticky.rect.left+"px",right:"auto",bottom:"auto"}),this.scrollTop+t.sticky.rect.height+t.sticky.marginTop>t.sticky.container.rect.top+t.sticky.container.rect.height?this.addStyle(t,{top:t.sticky.container.rect.top+t.sticky.container.rect.height-(this.scrollTop+t.sticky.rect.height)+"px"}):this.addStyle(t,{top:t.sticky.marginTop+"px"})):this.removeStyle(t,["position","width","top","left","right","bottom"]))}},{key:"addStyle",value:function(t,e){for(var i in e)e.hasOwnProperty(i)&&(t.style[i]=e[i])}},{key:"removeStyle",value:function(t,e){for(var i=0,o=e.length;i<o;i++)t.style[e[i]]=null}}]),t}();
\ No newline at end of file
+"use strict";function _classCallCheck(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}var _createClass=function(){function t(t,e){for(var i=0;i<e.length;i++){var o=e[i];o.enumerable=o.enumerable||!1,o.configurable=!0,"value"in o&&(o.writable=!0),Object.defineProperty(t,o.key,o)}}return function(e,i,o){return i&&t(e.prototype,i),o&&t(e,o),e}}(),Sticky=function(){function t(e){_classCallCheck(this,t),this.selector=e,this.vp=this.getViewportSize(),this.scrollTop=this.getScrollTopPosition(),this.initialize()}return _createClass(t,[{key:"initialize",value:function(){var t=this;this.elements=document.querySelectorAll(this.selector);var e=setInterval(function(){if("interactive"===document.readyState||"complete"===document.readyState){for(var i=0,o=t.elements.length;i<o;i++)t.activate(t.elements[i]);clearInterval(e)}},100)}},{key:"activate",value:function(t){var e=this;t.sticky={},t.sticky.marginTop=t.getAttribute("data-margin-top")?parseInt(t.getAttribute("data-margin-top")):0,t.sticky.rect=this.getRect(t),"img"===t.tagName.toLowerCase()&&(t.onload=function(){return t.sticky.rect=e.getRect(t)}),t.sticky.container=this.getContainer(t),t.sticky.container.rect=this.getRect(t.sticky.container),window.addEventListener("resize",function(){e.vp=e.getViewportSize(),e.updateRect(t),e.setPosition(t)}),window.addEventListener("scroll",function(){return e.scrollTop=e.getScrollTopPosition()}),window.addEventListener("scroll",function(){return e.setPosition(t)}),this.setPosition(t)}},{key:"getRect",value:function(t){var e=this.getTopLeftPosition(t);return e.offsetLeft=t.offsetLeft,e.width=t.offsetWidth,e.height=t.offsetHeight,e}},{key:"updateRect",value:function(t){this.removeStyle(t,["position","width","top","left","right","bottom"]),t.sticky.rect=this.getRect(t),t.sticky.container.rect=this.getRect(t.sticky.container)}},{key:"getTopLeftPosition",value:function(t){var e=0,i=0;do e+=t.offsetTop||0,i+=t.offsetLeft||0,t=t.offsetParent;while(t);return{top:e,left:i}}},{key:"getContainer",value:function(t){for(var e=t;"string"!=typeof e.getAttribute("data-sticky-container")&&e!==document.documentElement;)e=e.parentNode;return e}},{key:"getViewportSize",value:function(){return{width:Math.max(document.documentElement.clientWidth,window.innerWidth||0),height:Math.max(document.documentElement.clientHeight,window.innerHeight||0)}}},{key:"getScrollTopPosition",value:function(){return(window.pageYOffset||document.scrollTop)-(document.clientTop||0)||0}},{key:"setPosition",value:function(t){this.vp.height<t.sticky.rect.height||(this.removeStyle(t,["position","width","top","left","right","bottom"]),this.scrollTop>t.sticky.rect.top-t.sticky.marginTop?(this.addStyle(t,{position:"fixed",width:t.sticky.rect.width+"px",left:t.sticky.rect.left+"px",right:"auto",bottom:"auto"}),this.scrollTop+t.sticky.rect.height+t.sticky.marginTop>t.sticky.container.rect.top+t.sticky.container.rect.height?this.addStyle(t,{top:t.sticky.container.rect.top+t.sticky.container.rect.height-(this.scrollTop+t.sticky.rect.height)+"px"}):this.addStyle(t,{top:t.sticky.marginTop+"px"})):this.removeStyle(t,["position","width","top","left","right","bottom"]))}},{key:"update",value:function(){for(var t=0,e=this.elements.length;t<e;t++)this.updateRect(this.elements[t]),this.setPosition(this.elements[t])}},{key:"addStyle",value:function(t,e){for(var i in e)e.hasOwnProperty(i)&&(t.style[i]=e[i])}},{key:"removeStyle",value:function(t,e){for(var i=0,o=e.length;i<o;i++)t.style[e[i]]=null}}]),t}();
\ No newline at end of file
diff --git a/dist/sticky.min.js.gz b/dist/sticky.min.js.gz
index 59c35e1..5e628b4 100644
Binary files a/dist/sticky.min.js.gz and b/dist/sticky.min.js.gz differ
diff --git a/package.json b/package.json
index 64b7549..6820a0d 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "sticky-js",
-  "version": "1.0.0",
+  "version": "1.0.1",
   "description": "Sticky elements",
   "main": "dist/sticky.min.js",
   "scripts": {
diff --git a/src/sticky.js b/src/sticky.js
index dbb0530..0d46650 100644
--- a/src/sticky.js
+++ b/src/sticky.js
@@ -1,7 +1,7 @@
 
 class Sticky {
-  constructor(element) {
-    this.element = element;
+  constructor(selector) {
+    this.selector = selector;
 
     this.vp = this.getViewportSize();
     this.scrollTop = this.getScrollTopPosition();
@@ -10,11 +10,18 @@ class Sticky {
   }
 
   initialize() {
-    const stickyElements = document.querySelectorAll(this.element);
+    this.elements = document.querySelectorAll(this.selector);
 
-    for (let i = 0, len = stickyElements.length; i < len; i++) {
-      window.addEventListener('load', () => this.activate(stickyElements[i]));
-    }
+    // initialize sticky only when dom is fully loaded
+    const DOMContentLoaded = setInterval(() => {
+      if (document.readyState === 'interactive' || document.readyState === 'complete') {
+        for (let i = 0, len = this.elements.length; i < len; i++) {
+          this.activate(this.elements[i]);
+        }
+
+        clearInterval(DOMContentLoaded);
+      }
+    }, 100);
   }
 
   activate(el) {
@@ -23,6 +30,11 @@ class Sticky {
     el.sticky.marginTop = el.getAttribute('data-margin-top') ? parseInt(el.getAttribute('data-margin-top')) : 0;
     el.sticky.rect = this.getRect(el);
 
+    // fix when el is image that has not yet loaded and width, height = 0
+    if (el.tagName.toLowerCase() === 'img') {
+      el.onload = () => el.sticky.rect = this.getRect(el);
+    }
+
     el.sticky.container = this.getContainer(el);
     el.sticky.container.rect = this.getRect(el.sticky.container);
 
@@ -117,6 +129,13 @@ class Sticky {
     }
   }
 
+  update() {
+    for (let i = 0, len = this.elements.length; i < len; i++) {
+      this.updateRect(this.elements[i]);
+      this.setPosition(this.elements[i]);
+    }
+  }
+
   addStyle(el, styles) {
     for (let property in styles) {
       if (styles.hasOwnProperty(property)) {