diff --git a/bootstro.js b/bootstro.js
index 80a995e..5da077e 100644
--- a/bootstro.js
+++ b/bootstro.js
@@ -28,7 +28,8 @@ $(document).ready(function(){
             finishButtonText : '<i class="icon-ok"></i> Ok I got it, get back to the site',
             //finishButton : '<button class="btn btn-xs btn-success bootstro-finish-btn"><i class="icon-ok"></i> Ok I got it, get back to the site</button>',
             stopOnBackdropClick : true,
-            stopOnEsc : true,
+            stopOnEsc: true,
+            allowAjaxInvisElements: false,
             
             //onComplete : function(params){} //params = {idx : activeIndex}
             //onExit : function(params){} //params = {idx : activeIndex}
@@ -136,12 +137,13 @@ $(document).ready(function(){
         {
             var selectorArr = [];
             $.each(popover, function(t,e){
-                //only deal with the visible element
+                //only deal with the visible element, unless flag is set
                 //build the selector
                 $.each(e, function(j, attr){
                     $(e.selector).attr('data-bootstro-' + j, attr);
                 });
-                if ($(e.selector).is(":visible"))
+
+                if (settings.allowAjaxInvisElements || $(e.selector).is(":visible"))
                     selectorArr.push(e.selector);
             });
             return selectorArr.join(",");
@@ -289,9 +291,9 @@ $(document).ready(function(){
             }
             else 
             {
-                bootstro.go_to(activeIndex + 1);
                 if (typeof settings.onStep == 'function')
                     settings.onStep.call(this, {idx : activeIndex, direction : 'next'});//
+                bootstro.go_to(activeIndex + 1);
             }
         };
         
@@ -306,9 +308,9 @@ $(document).ready(function(){
             }
             else
             {
-                bootstro.go_to(activeIndex -1);
                 if (typeof settings.onStep == 'function')
                     settings.onStep.call(this, {idx : activeIndex, direction : 'prev'});//
+                bootstro.go_to(activeIndex -1);
             }
         };
         
diff --git a/bootstro.min.js b/bootstro.min.js
index c6861c0..ad1d077 100644
--- a/bootstro.min.js
+++ b/bootstro.min.js
@@ -1 +1 @@
-$(document).ready(function(){(function(e,t,n){function f(e){var n=t(window).scrollTop();var r=n+t(window).height();var i=e.offset().top;var s=i+e.height();return s>=n&&i<=r&&s<=r&&i>=n}function l(e,t){var n=get_element(t);var r,s,o;e=e+"<div class='bootstro-nav-wrapper'>";if(n.attr("data-bootstro-nextButton")){r=n.attr("data-bootstro-nextButton")}else if(n.attr("data-bootstro-nextButtonText")){r='<button class="btn btn-primary btn-mini bootstro-next-btn">'+n.attr("data-bootstro-nextButtonText")+"</button>"}else{if(typeof a.nextButton!="undefined")r=a.nextButton;else r='<button class="btn btn-primary btn-mini bootstro-next-btn">'+a.nextButtonText+"</button>"}if(n.attr("data-bootstro-prevButton")){s=n.attr("data-bootstro-prevButton")}else if(n.attr("data-bootstro-prevButtonText")){s='<button class="btn btn-primary btn-mini bootstro-prev-btn">'+n.attr("data-bootstro-prevButtonText")+"</button>"}else{if(typeof a.prevButton!="undefined")s=a.prevButton;else s='<button class="btn btn-primary btn-mini bootstro-prev-btn">'+a.prevButtonText+"</button>"}if(n.attr("data-bootstro-finishButton")){o=n.attr("data-bootstro-finishButton")}else if(n.attr("data-bootstro-finishButtonText")){o='<button class="btn btn-primary btn-mini bootstro-finish-btn">'+n.attr("data-bootstro-finishButtonText")+"</button>"}else{if(typeof a.finishButton!="undefined")o=a.finishButton;else o='<button class="btn btn-primary btn-mini bootstro-finish-btn">'+a.finishButtonText+"</button>"}if(i!=1){if(t==0)e=e+r;else if(t==i-1)e=e+s;else e=e+r+s}e=e+"</div>";e=e+'<div class="bootstro-finish-btn-wrapper">'+o+"</div>";return e}var r;var i;var s=[];var o=null;var u={nextButtonText:"Next »",prevButtonText:"« Prev",finishButtonText:'<i class="icon-ok"></i> Ok I got it, get back to the site',stopOnBackdropClick:true,stopOnEsc:true,margin:100};var a;get_element=function(e){if(r.filter("[data-bootstro-step="+e+"]").size()>0)return r.filter("[data-bootstro-step="+e+"]");else{return r.eq(e)}};get_popup=function(e){var t={};var n=get_element(e);var r="";if(i>1){r="<span class='label label-success'>"+(e+1)+"/"+i+"</span>"}t.title=n.attr("data-bootstro-title")||"";if(t.title!=""&&r!="")t.title=r+" - "+t.title;else if(t.title=="")t.title=r;t.content=n.attr("data-bootstro-content")||"";t.content=l(t.content,e);t.placement=n.attr("data-bootstro-placement")||"top";var s="";if(n.attr("data-bootstro-width")){t.width=n.attr("data-bootstro-width");s=s+"width:"+n.attr("data-bootstro-width")+";"}if(n.attr("data-bootstro-height")){t.height=n.attr("data-bootstro-height");s=s+"height:"+n.attr("data-bootstro-height")+";"}t.trigger="manual";t.html=n.attr("data-bootstro-html")||"top";t.template='<div class="popover" style="'+s+'"><div class="arrow"></div><div class="popover-inner"><h3 class="popover-title"></h3><div class="popover-content"><p></p></div></div>'+"</div>";return t};e.destroy_popover=function(e){var e=e||0;if(e!="all"){var t=get_element(e);t.popover("destroy").removeClass("bootstro-highlight")}};e.stop=function(){e.destroy_popover(o);e.unbind();t("div.bootstro-backdrop").remove();if(typeof a.onExit=="function")a.onExit.call(this,{idx:o})};e.go_to=function(n){e.destroy_popover(o);if(i!=0){var r=get_popup(n);var s=get_element(n);s.popover(r).popover("show");var u=t(window).scrollTop();var l=Math.min(t(".popover.in").offset().top,s.offset().top);var c=l-u;if(c<a.margin)t("html,body").animate({scrollTop:l-a.margin},"slow");else if(!f(t(".popover.in"))||!f(s))t("html,body").animate({scrollTop:l-a.margin},"slow");s.addClass("bootstro-highlight");o=n}};e.next=function(){if(o+1==i){if(typeof a.onComplete=="function")a.onComplete.call(this,{idx:o})}else{e.go_to(o+1);if(typeof a.onStep=="function")a.onStep.call(this,{idx:o,direction:"next"})}};e.prev=function(){if(o==0){}else{e.go_to(o-1);if(typeof a.onStep=="function")a.onStep.call(this,{idx:o,direction:"prev"})}};e._start=function(n){n=n||".bootstro";r=t(n);i=r.size();if(i>0&&t("div.bootstro-backdrop").length===0){t('<div class="bootstro-backdrop"></div>').appendTo("body");e.bind();e.go_to(0)}};e.start=function(n,r){a=t.extend(true,{},u);t.extend(a,r||{});if(typeof a.url!="undefined"){t.ajax({url:a.url,success:function(r){if(r.success){var i=r.result;var s=[];t.each(i,function(e,n){t.each(n,function(e,r){t(n.selector).attr("data-bootstro-"+e,r)});if(t(n.selector).is(":visible"))s.push(n.selector)});n=s.join(",");e._start(n)}}})}else{e._start(n)}};e.bind=function(){e.unbind();t("html").on("click.bootstro",".bootstro-next-btn",function(t){e.next();t.preventDefault();return false});t("html").on("click.bootstro",".bootstro-prev-btn",function(t){e.prev();t.preventDefault();return false});t("html").on("click.bootstro",".bootstro-finish-btn",function(t){e.stop()});if(a.stopOnBackdropClick){t("html").on("click.bootstro","div.bootstro-backdrop",function(n){if(t(n.target).hasClass("bootstro-backdrop"))e.stop()})}t(document).on("keydown.bootstro",function(t){var n=t.keyCode?t.keyCode:t.which;if(n==39||n==40)e.next();else if(n==37||n==38)e.prev();else if(n==27&&a.stopOnEsc)e.stop()})};e.unbind=function(){t("html").unbind("click.bootstro");t(document).unbind("keydown.bootstro")}})(window.bootstro=window.bootstro||{},jQuery)})
+$(document).ready(function(){!function(a,b,c){function d(a){var c=b(window).scrollTop(),d=c+b(window).height(),e=a.offset().top,f=e+a.height();return f>=c&&d>=e&&d>=f&&e>=c}function e(a,b){var c,d,e,f,i=get_element(b);return f=2==j?"btn btn-primary btn-mini":"btn btn-primary btn-xs",a+="<div class='bootstro-nav-wrapper'>",c=i.attr("data-bootstro-nextButton")?i.attr("data-bootstro-nextButton"):i.attr("data-bootstro-nextButtonText")?'<button class="'+f+' bootstro-next-btn">'+i.attr("data-bootstro-nextButtonText")+"</button>":"undefined"!=typeof h.nextButton?h.nextButton:'<button class="'+f+' bootstro-next-btn">'+h.nextButtonText+"</button>",d=i.attr("data-bootstro-prevButton")?i.attr("data-bootstro-prevButton"):i.attr("data-bootstro-prevButtonText")?'<button class="'+f+' bootstro-prev-btn">'+i.attr("data-bootstro-prevButtonText")+"</button>":"undefined"!=typeof h.prevButton?h.prevButton:'<button class="'+f+' bootstro-prev-btn">'+h.prevButtonText+"</button>",e=i.attr("data-bootstro-finishButton")?i.attr("data-bootstro-finishButton"):i.attr("data-bootstro-finishButtonText")?'<button class="'+f+' bootstro-finish-btn">'+i.attr("data-bootstro-finishButtonText")+"</button>":"undefined"!=typeof h.finishButton?h.finishButton:'<button class="'+f+' bootstro-finish-btn">'+h.finishButtonText+"</button>",1!=g&&(0==b?a+=c:b==g-1?a+=d:a=a+c+d),a+="</div>",a=a+'<div class="bootstro-finish-btn-wrapper">'+e+"</div>"}var f,g,h,i=null,j=3,k={nextButtonText:"Next &raquo;",prevButtonText:"&laquo; Prev",finishButtonText:'<i class="icon-ok"></i> Ok I got it, get back to the site',stopOnBackdropClick:!0,stopOnEsc:!0,margin:100};process_items=function(a){var c=[];return b.each(a,function(a,d){b.each(d,function(a,c){b(d.selector).attr("data-bootstro-"+a,c)}),b(d.selector).is(":visible")&&c.push(d.selector)}),c.join(",")},get_element=function(a){return f.filter("[data-bootstro-step="+a+"]").size()>0?f.filter("[data-bootstro-step="+a+"]"):f.eq(a)},get_popup=function(a){var b={},c=get_element(a),d="";g>1&&(d="<span class='label label-success'>"+(a+1)+"/"+g+"</span>"),b.title=c.attr("data-bootstro-title")||"",""!=b.title&&""!=d?b.title=d+" - "+b.title:""==b.title&&(b.title=d),b.content=c.attr("data-bootstro-content")||"",b.content=e(b.content,a),b.placement=c.attr("data-bootstro-placement")||"top";var f="";return c.attr("data-bootstro-width")&&(b.width=c.attr("data-bootstro-width"),f=f+"width:"+c.attr("data-bootstro-width")+";"),c.attr("data-bootstro-height")&&(b.height=c.attr("data-bootstro-height"),f=f+"height:"+c.attr("data-bootstro-height")+";"),b.trigger="manual",b.html=c.attr("data-bootstro-html")||"top",c.attr("data-bootstro-container")&&(b.container=c.attr("data-bootstro-container")),b.template='<div class="popover" style="'+f+'"><div class="arrow"></div><div class="popover-inner"><h3 class="popover-title"></h3><div class="popover-content"><p></p></div></div></div>',b},a.destroy_popover=function(a){var a=a||0;if("all"!=a){var b=get_element(a);b.popover("destroy").removeClass("bootstro-highlight")}},a.stop=function(){a.destroy_popover(i),a.unbind(),b("div.bootstro-backdrop").remove(),"function"==typeof h.onExit&&h.onExit.call(this,{idx:i})},a.go_to=function(c){if(a.destroy_popover(i),0!=g){var e=get_popup(c),f=get_element(c);f.popover(e).popover("show");var j=b(window).scrollTop(),k=Math.min(b(".popover.in").offset().top,f.offset().top),l=k-j;l<h.margin?b("html,body").animate({scrollTop:k-h.margin},"slow"):d(b(".popover.in"))&&d(f)||b("html,body").animate({scrollTop:k-h.margin},"slow"),f.addClass("bootstro-highlight"),i=c}},a.next=function(){i+1==g?"function"==typeof h.onComplete&&h.onComplete.call(this,{idx:i}):("function"==typeof h.onStep&&h.onStep.call(this,{idx:i,direction:"next"}),a.go_to(i+1))},a.prev=function(){0==i||("function"==typeof h.onStep&&h.onStep.call(this,{idx:i,direction:"prev"}),a.go_to(i-1))},a._start=function(c){c=c||".bootstro",f=b(c),g=f.size(),g>0&&0===b("div.bootstro-backdrop").length&&(b('<div class="bootstro-backdrop"></div>').appendTo("body"),a.bind(),a.go_to(0))},a.start=function(c,d){h=b.extend(!0,{},k),b.extend(h,d||{}),"undefined"!=typeof h.url?b.ajax({url:h.url,success:function(b){if(b.success){var d=b.result;c=process_items(d),a._start(c)}}}):"undefined"!=typeof h.items?a._start(process_items(h.items)):a._start(c)},a.set_bootstrap_version=function(a){j=a},a.bind=function(){a.unbind(),b("html").on("click.bootstro",".bootstro-next-btn",function(b){return a.next(),b.preventDefault(),!1}),b("html").on("click.bootstro",".bootstro-prev-btn",function(b){return a.prev(),b.preventDefault(),!1}),b("html").on("click.bootstro",".bootstro-finish-btn",function(b){b.preventDefault(),a.stop()}),h.stopOnBackdropClick&&b("html").on("click.bootstro","div.bootstro-backdrop",function(c){b(c.target).hasClass("bootstro-backdrop")&&a.stop()}),b(document).on("keydown.bootstro",function(b){var c=b.keyCode?b.keyCode:b.which;39==c||40==c?a.next():37==c||38==c?a.prev():27==c&&h.stopOnEsc&&a.stop()})},a.unbind=function(){b("html").unbind("click.bootstro"),b(document).unbind("keydown.bootstro")}}(window.bootstro=window.bootstro||{},jQuery)});
\ No newline at end of file