diff --git a/js/hopscotch-0.0.5.js b/js/hopscotch-0.0.5.js
index a5fb546b..b3786b36 100644
--- a/js/hopscotch-0.0.5.js
+++ b/js/hopscotch-0.0.5.js
@@ -228,13 +228,13 @@
           i,
           len;
 
-      for (i=0, len=cbArr.length; i<len; ++i) {
-        this.invokeCallback(cbArr[i].cb);
-      }
-
       if (stepCb) {
         this.invokeCallback(stepCb);
       }
+
+      for (i=0, len=cbArr.length; i<len; ++i) {
+        this.invokeCallback(cbArr[i].cb);
+      }
     },
 
     /**
diff --git a/js/hopscotch-0.0.5.min.js b/js/hopscotch-0.0.5.min.js
index 20f32e8c..05d70ebe 100644
--- a/js/hopscotch-0.0.5.min.js
+++ b/js/hopscotch-0.0.5.min.js
@@ -1,7 +1,7 @@
 (function(z,E){var p,A,F,m,G=window.Sizzle||null,b,s,x,t,n=z[E],H=!1,u={animate:!1,smoothScroll:!0,scrollDuration:1E3,scrollTopMargin:200,showCloseButton:!0,showPrevButton:!1,showNextButton:!0,bubbleWidth:280,bubblePadding:15,arrowWidth:20,skipIfNoElement:!0},C="undefined"!==typeof window.jQuery,v="undefined"!==typeof window.sessionStorage,f=window.document;n||(Array.isArray||(Array.isArray=function(a){return"[object Array]"===Object.prototype.toString.call(a)}),p=function(){H&&n.startTour()},window.addEventListener?
 window.addEventListener("load",p,!1):window.attachEvent&&window.attachEvent("onload",p),b={addClass:function(a,e){var b,d,h;if(0===a.className.length)a.className=e;else{b=a.className.split(/\s+/);d=0;for(h=b.length;d<h;++d)if(b[d]===e)return;b.splice(0,0,e);a.className=b.join(" ")}},removeClass:function(a,b){var c,d,h,j,g,f,i;d=b.split(/\s+/);c=a.className.split(/\s+/);j=0;for(f=d.length;j<f;++j){h=d[j];g=0;for(i=c.length;g<i&&c[g]!==h;++g);g<i&&c.splice(g,1)}a.className=c.join(" ")},getPixelValue:function(a){var b=
 typeof a;return"number"===b?a:"string"===b?parseInt(a,10):0},valOrDefault:function(a,b){return"undefined"!==typeof a?a:b},supportsCssTransitions:function(){var a=f.body.style;return"undefined"!==typeof a.MozTransition||"undefined"!==typeof a.MsTransition||"undefined"!==typeof a.webkitTransition||"undefined"!==typeof a.OTransition||"undefined"!==typeof a.transition},invokeCallbackArrayHelper:function(a){var b;Array.isArray(a)&&(b=x[a[0]],"function"===typeof b&&b.apply(this,a.slice(1)))},invokeCallbackArray:function(a){var e,
-c;if(Array.isArray(a))if("string"===typeof a[0])b.invokeCallbackArrayHelper(a);else{e=0;for(c=a.length;e<c;++e)b.invokeCallback(a[e])}},invokeCallback:function(a){"function"===typeof a&&a();if("string"===typeof a&&x[a])x[a]();else b.invokeCallbackArray(a)},invokeEventCallbacks:function(a,b){var c=s[a],d,h;d=0;for(h=c.length;d<h;++d)this.invokeCallback(c[d].cb);b&&this.invokeCallback(b)},getScrollTop:function(){return"undefined"!==typeof window.pageYOffset?window.pageYOffset:f.documentElement.scrollTop},
+c;if(Array.isArray(a))if("string"===typeof a[0])b.invokeCallbackArrayHelper(a);else{e=0;for(c=a.length;e<c;++e)b.invokeCallback(a[e])}},invokeCallback:function(a){"function"===typeof a&&a();if("string"===typeof a&&x[a])x[a]();else b.invokeCallbackArray(a)},invokeEventCallbacks:function(a,b){var c=s[a],d,h;b&&this.invokeCallback(b);d=0;for(h=c.length;d<h;++d)this.invokeCallback(c[d].cb)},getScrollTop:function(){return"undefined"!==typeof window.pageYOffset?window.pageYOffset:f.documentElement.scrollTop},
 getScrollLeft:function(){return"undefined"!==typeof window.pageXOffset?window.pageXOffset:f.documentElement.scrollLeft},getWindowHeight:function(){return window.innerHeight||f.documentElement.clientHeight},getWindowWidth:function(){return window.innerWidth||f.documentElement.clientWidth},addClickListener:function(a,b){return a.addEventListener?a.addEventListener("click",b,!1):a.attachEvent("onclick",b)},removeClickListener:function(a,b){return a.removeEventListener?a.removeEventListener("click",b,
 !1):a.detachEvent("click",b)},documentIsReady:function(){return"complete"===f.readyState||"interactive"===f.readyState},evtPreventDefault:function(a){a.preventDefault?a.preventDefault():event&&(event.returnValue=!1)},extend:function(a,b){for(var c in b)b.hasOwnProperty(c)&&(a[c]=b[c])},getStepTargetHelper:function(a){return/^[#\.]/.test(a)?f.querySelector?f.querySelector(a):C?(a=jQuery(a),a.length?a[0]:null):G?(a=new G(a),a.length?a[0]:null):/^#[a-zA-Z][\w-_:.]*$/.test(a)?f.getElementById(a.substring(1)):
 null:f.getElementById(a)},getStepTarget:function(a){var e;if(!a||!a.target)return null;if("string"===typeof a.target)return a.target=b.getStepTargetHelper(a.target);if(Array.isArray(a.target)){var c,d;c=0;for(d=a.target.length;c<d;c++)if("string"===typeof a.target[c]&&(e=b.getStepTargetHelper(a.target[c])))return a.target=e;return null}return a.target},setState:function(a,b,c){var d="";v?sessionStorage.setItem(a,b):(c&&(d=new Date,d.setTime(d.getTime()+864E5*c),d="; expires="+d.toGMTString()),f.cookie=