diff --git a/admin.php b/admin.php
index 2d9151d..03b074a 100755
--- a/admin.php
+++ b/admin.php
@@ -20,10 +20,10 @@ function page_content() {
 				'value' => array( 'yes' => __( 'Yes', 'bj-lazy-load' ), 'no' => __( 'No', 'bj-lazy-load' ) ),
 			),
 			array(
-				'title' => __( 'Apply to text widgets', 'bj-lazy-load' ),
+				'title' => __( 'Apply to sidebar widgets', 'bj-lazy-load' ),
 				'type' => 'radio',
-				'name' => 'filter_widget_text',
-				'value' => array( 'yes' => __( 'Yes', 'bj-lazy-load' ), 'no' => __( 'No', 'bj-lazy-load' ) ),
+				'name' => 'filter_sidebar_widgets',
+				'value' => array( 'yes' => __( 'Yes', 'bj-lazy-load' ), 'no' => __( 'No', 'bj-lazy-load' ), 'only_text_widgets' => __( 'Only Text Widgets', 'bj-lazy-load' ) ),
 			),
 			array(
 				'title' => __( 'Apply to post thumbnails', 'bj-lazy-load' ),
@@ -49,6 +49,12 @@ function page_content() {
 				'name' => 'lazy_load_iframes',
 				'value' => array( 'yes' => __( 'Yes', 'bj-lazy-load' ), 'no' => __( 'No', 'bj-lazy-load' ) ),
 			),
+			array(
+				'title' => __( 'Lazy load twitter timeline', 'bj-lazy-load' ),
+				'type' => 'radio',
+				'name' => 'lazy_load_twitter_timeline',
+				'value' => array( 'yes' => __( 'Yes', 'bj-lazy-load' ), 'no' => __( 'No', 'bj-lazy-load' ) ),
+			),
 			array(
 				'title' => __( 'Theme loader function', 'bj-lazy-load' ),
 				'type' => 'select',
diff --git a/bj-lazy-load.php b/bj-lazy-load.php
index f603ae9..8d9ee37 100755
--- a/bj-lazy-load.php
+++ b/bj-lazy-load.php
@@ -78,7 +78,11 @@ function __construct() {
 			if ( $options->get( 'filter_content' ) == 'yes' ) {
 				add_filter( 'the_content', array( $this, 'filter' ), 200 );
 			}
-			if ( $options->get( 'filter_widget_text' ) == 'yes' ) {
+			if ( $options->get( 'filter_sidebar_widgets' ) == 'yes' ) {
+				add_action( 'dynamic_sidebar_before', array( $this, 'observe_sidebar' ), 200 );
+				add_action( 'dynamic_sidebar_after', array( $this, 'stop_observing_sidebar_and_output_sidebar' ), 200 );
+			}
+			if ( $options->get( 'filter_sidebar_widgets' ) == 'only_text_widgets' ) {
 				add_filter( 'widget_text', array( $this, 'filter' ), 200 );
 			}
 			if ( $options->get( 'filter_post_thumbnails' ) == 'yes' ) {
@@ -165,6 +169,10 @@ static function filter( $content ) {
 			if ( $options->get('lazy_load_iframes') == 'yes' ) {
 				$content = $BJLL->_filter_iframes( $content );
 			}
+			
+			if ( $options->get('lazy_load_twitter_timeline') == 'yes' ) {
+				$content = $BJLL->_filter_twitter_timeline( $content );
+			}
 		
 			return $content;
 		}
@@ -237,23 +245,47 @@ protected function _filter_iframes( $content ) {
 			return $content;
 		}
 		
+		protected function _filter_twitter_timeline( $content ) {
+		
+			$matches = array();
+			preg_match_all( '/<a\s+[^>]*?class="twitter-timeline".*?<\/a>/s', $content, $matches );
+			
+			$search = array();
+			$replace = array();
+			
+			foreach ( $matches[0] as $twitterTimelineHTML ) {
+				
+				$replaceHTML = '<img src="' . $this->_placeholder_url . '"  class="lazy lazy-hidden" data-lazy-type="twitter" data-lazy-src="' . base64_encode($twitterTimelineHTML) . '" alt="">';
+				
+				$replaceHTML .= '<noscript>' . $twitterTimelineHTML . '</noscript>';
+				
+				array_push( $search, $twitterTimelineHTML );
+				array_push( $replace, $replaceHTML );
+			}
+		
+			$content = str_replace( $search, $replace, $content );
+			
+			return $content;
+		}
+		
 		protected static function _get_options() {
 			return new scbOptions( 'bj_lazy_load_options', __FILE__, array(
-				'filter_content'          => 'yes',
-				'filter_widget_text'      => 'yes',
-				'filter_post_thumbnails'  => 'yes',
-				'filter_gravatars'        => 'yes',
-				'lazy_load_images'        => 'yes',
-				'lazy_load_iframes'       => 'yes',
-				'theme_loader_function'   => 'wp_footer',
-				'placeholder_url'         => '',
-				'skip_classes'            => '',
-				'load_hidpi'              => 'no',
-				'load_responsive'         => 'no',
-				'disable_on_wptouch'      => 'yes',
-				'disable_on_mobilepress'  => 'yes',
-				'infinite_scroll'         => 'no',
-				'threshold'               => '200'
+				'filter_content'             => 'yes',
+				'filter_sidebar_widgets'     => 'yes',
+				'filter_post_thumbnails'     => 'yes',
+				'filter_gravatars'           => 'yes',
+				'lazy_load_images'           => 'yes',
+				'lazy_load_iframes'          => 'yes',
+				'lazy_load_twitter_timeline' => 'yes',
+				'theme_loader_function'      => 'wp_footer',
+				'placeholder_url'            => '',
+				'skip_classes'               => '',
+				'load_hidpi'                 => 'no',
+				'load_responsive'            => 'no',
+				'disable_on_wptouch'         => 'yes',
+				'disable_on_mobilepress'     => 'yes',
+				'infinite_scroll'            => 'no',
+				'threshold'                  => '200'
 			) );
 		}
 		
@@ -310,6 +342,28 @@ static function has_mobilepress() {
 			return false;
 		}
 		
+		function observe_sidebar() {
+			if ( !is_admin() ) {
+				// Only start observing output if we're not in the admin area
+				ob_start();
+			}
+		}
+		
+		function stop_observing_sidebar_and_output_sidebar() {
+			if ( !is_admin() ) {
+				// Only work with observer if we're not in the admin area
+				
+				// Get the sidebar content and shut down the observer
+				$sidebar_contents = ob_get_clean();
+				
+				// Process the sidebar content for iframes and images
+				$sidebar_contents = $this->filter($sidebar_contents);
+				
+				// Output the sidebar content
+				echo $sidebar_contents;
+			}
+		}
+		
 	}
 }
 
diff --git a/js/bj-lazy-load.js b/js/bj-lazy-load.js
index 1897f2d..267e883 100755
--- a/js/bj-lazy-load.js
+++ b/js/bj-lazy-load.js
@@ -48,6 +48,15 @@ var BJLL = BJLL || {};
 						$el.attr( 'data-lazy-src' )
 					)
 				);
+			} else if ( data_lazy_type == 'twitter' ) {
+				$el.replaceWith(
+					bj_lazy_load_base64_decode(
+						$el.attr( 'data-lazy-src' )
+					)
+				);
+				if (typeof twttr !== "undefined") {
+					twttr.widgets.load();
+				}
 			}
 		}).addClass( 'data-lazy-ready' );
 		
@@ -115,4 +124,4 @@ var BJLL = BJLL || {};
 	}
 	$( window ).on( 'resize', function() { $( document ).trigger( 'scroll' ); } );
 	
-})(jQuery);
\ No newline at end of file
+})(jQuery);
diff --git a/js/combined.min.js b/js/combined.min.js
index 3806da9..23c4f61 100755
--- a/js/combined.min.js
+++ b/js/combined.min.js
@@ -1 +1,7 @@
-(function($,win,doc,undefined){$.fn.sonar=function(distance,full){if(typeof distance==="boolean"){full=distance;distance=undefined}return $.sonar(this[0],distance,full)};var body=doc.body,$win=$(win),onScreenEvent="scrollin",offScreenEvent="scrollout",detect=function(elem,distance,full){if(elem){body||(body=doc.body);var parentElem=elem,elemTop=0,bodyHeight=body.offsetHeight,screenHeight=win.innerHeight||doc.documentElement.clientHeight||body.clientHeight||0,scrollTop=doc.documentElement.scrollTop||win.pageYOffset||body.scrollTop||0,elemHeight=elem.offsetHeight||0;if(!elem.sonarElemTop||elem.sonarBodyHeight!==bodyHeight){if(parentElem.offsetParent){do{elemTop+=parentElem.offsetTop}while(parentElem=parentElem.offsetParent)}elem.sonarElemTop=elemTop;elem.sonarBodyHeight=bodyHeight}distance=distance===undefined?0:distance;return!(elem.sonarElemTop+(full?0:elemHeight)<scrollTop-distance)&&!(elem.sonarElemTop+(full?elemHeight:0)>scrollTop+screenHeight+distance)}},pollQueue={},pollActive=0,pollId,poll=function(){pollId&&clearTimeout(pollId);pollId=setTimeout(function(){var elem,elems,screenEvent,options,detected,i,l;for(screenEvent in pollQueue){elems=pollQueue[screenEvent];for(i=0,l=elems.length;i<l;i++){options=elems[i];elem=options.elem;detected=detect(elem,options.px,options.full);if(screenEvent===offScreenEvent?!detected:detected){if(!options.tr){if(elem["_"+screenEvent]){$(elem).triggerHandler(screenEvent);options.tr=1}else{elems.splice(i,1);i--;l--}}}else{options.tr=0}}}},0)},removeSonar=function(elem,screenEvent){elem["_"+screenEvent]=0},addSonar=function(elem,options){var distance=options.px,full=options.full,screenEvent=options.evt,parent=win,detected=detect(elem,distance,full),triggered=0;elem["_"+screenEvent]=1;if(screenEvent===offScreenEvent?!detected:detected){setTimeout(function(){$(elem).triggerHandler(screenEvent===offScreenEvent?offScreenEvent:onScreenEvent)},0);triggered=1}pollQueue[screenEvent].push({elem:elem,px:distance,full:full,tr:triggered});if(!pollActive){$win.bind("scroll",poll);pollActive=1}};$.sonar=detect;pollQueue[onScreenEvent]=[];$.event.special[onScreenEvent]={add:function(handleObj){var data=handleObj.data||{},elem=this;if(!elem[onScreenEvent]){addSonar(this,{px:data.distance,full:data.full,evt:onScreenEvent})}},remove:function(handleObj){removeSonar(this,onScreenEvent)}};pollQueue[offScreenEvent]=[];$.event.special[offScreenEvent]={add:function(handleObj){var data=handleObj.data||{},elem=this;if(!elem[offScreenEvent]){addSonar(elem,{px:data.distance,full:data.full,evt:offScreenEvent})}},remove:function(handleObj){removeSonar(this,offScreenEvent)}}})(jQuery,window,document);var BJLL=BJLL||{};!function($){function bj_lazy_load_init(){var threshold=200;"undefined"!=typeof BJLL.threshold&&(threshold=parseInt(BJLL.threshold)),$(".lazy-hidden").not(".data-lazy-ready").one("scrollin.bj_lazy_load",{distance:threshold},function(){var $el=$(this),data_lazy_type=$el.attr("data-lazy-type");if("image"==data_lazy_type){var imgurl=$el.attr("data-lazy-src");if("yes"==BJLL.load_responsive||"yes"==BJLL.load_hidpi){var l=document.createElement("a");if(l.href=$el.attr("data-lazy-src"),!l.hostname.length||l.hostname==window.location.hostname){var loadimgwidth=parseInt($el.css("width"));window.devicePixelRatio>1&&"yes"==BJLL.load_hidpi&&(loadimgwidth=Math.ceil(window.devicePixelRatio*loadimgwidth));var srcimgurl=$el.attr("data-lazy-src");"undefined"!=typeof BJLL.site_url&&"undefined"!=typeof BJLL.network_site_url&&(srcimgurl=srcimgurl.replace(BJLL.site_url,BJLL.network_site_url)),imgurl=BJLL.thumb_base+encodeURIComponent(srcimgurl)+"&w="+loadimgwidth}}$el.hide().attr("src",imgurl).removeClass("lazy-hidden").fadeIn()}else"iframe"==data_lazy_type&&$el.replaceWith(bj_lazy_load_base64_decode($el.attr("data-lazy-src")))}).addClass("data-lazy-ready")}function bj_lazy_load_base64_decode(data){var o1,o2,o3,h1,h2,h3,h4,bits,b64="ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=",i=0,ac=0,dec="",tmp_arr=[];if(!data)return data;data+="";do h1=b64.indexOf(data.charAt(i++)),h2=b64.indexOf(data.charAt(i++)),h3=b64.indexOf(data.charAt(i++)),h4=b64.indexOf(data.charAt(i++)),bits=h1<<18|h2<<12|h3<<6|h4,o1=bits>>16&255,o2=bits>>8&255,o3=255&bits,tmp_arr[ac++]=64==h3?String.fromCharCode(o1):64==h4?String.fromCharCode(o1,o2):String.fromCharCode(o1,o2,o3);while(i<data.length);return dec=tmp_arr.join("")}$(document).on("ready",bj_lazy_load_init),"yes"==BJLL.infinite_scroll&&$(window).on("scroll",bj_lazy_load_init),$(window).on("resize",function(){$(document).trigger("scroll")})}(jQuery);
\ No newline at end of file
+(function(e,m,h,c){e.fn.sonar=function(a,b){"boolean"===typeof a&&(b=a,a=c);return e.sonar(this[0],a,b)};var b=h.body,d=e(m),n=function(a,d,n){if(a){b||(b=h.body);var e=a,p=0,l=b.offsetHeight,k=m.innerHeight||h.documentElement.clientHeight||b.clientHeight||0,f=h.documentElement.scrollTop||m.pageYOffset||b.scrollTop||0,g=a.offsetHeight||0;if(!a.sonarElemTop||a.sonarBodyHeight!==l){if(e.offsetParent){do p+=e.offsetTop;while(e=e.offsetParent)}a.sonarElemTop=p;a.sonarBodyHeight=l}d=d===c?0:d;return!(a.sonarElemTop+
+(n?0:g)<f-d)&&!(a.sonarElemTop+(n?g:0)>f+k+d)}},k={},q=0,f,r=function(){f&&clearTimeout(f);f=setTimeout(function(){var a,b,d,c,f,l,g;for(d in k)for(b=k[d],l=0,g=b.length;l<g;l++)c=b[l],a=c.elem,f=n(a,c.px,c.full),("scrollout"===d?!f:f)?c.tr||(a["_"+d]?(e(a).triggerHandler(d),c.tr=1):(b.splice(l,1),l--,g--)):c.tr=0},0)},g=function(a,b){var c=b.px,f=b.full,g=b.evt,l=n(a,c,f),h=0;a["_"+g]=1;if("scrollout"===g?!l:l)setTimeout(function(){e(a).triggerHandler("scrollout"===g?"scrollout":"scrollin")},0),
+h=1;k[g].push({elem:a,px:c,full:f,tr:h});q||(d.bind("scroll",r),q=1)};e.sonar=n;k.scrollin=[];e.event.special.scrollin={add:function(a){a=a.data||{};this.scrollin||g(this,{px:a.distance,full:a.full,evt:"scrollin"})},remove:function(a){this._scrollin=0}};k.scrollout=[];e.event.special.scrollout={add:function(a){a=a.data||{};this.scrollout||g(this,{px:a.distance,full:a.full,evt:"scrollout"})},remove:function(a){this._scrollout=0}}})(jQuery,window,document);var BJLL=BJLL||{};
+(function(e){function m(){var c=200;"undefined"!=typeof BJLL.threshold&&(c=parseInt(BJLL.threshold));e(".lazy-hidden").not(".data-lazy-ready").one("scrollin.bj_lazy_load",{distance:c},function(){var b=e(this),d=b.attr("data-lazy-type");if("image"==d){d=b.attr("data-lazy-src");if("yes"==BJLL.load_responsive||"yes"==BJLL.load_hidpi){var c=document.createElement("a");c.href=b.attr("data-lazy-src");c.hostname.length&&c.hostname!=window.location.hostname||(d=parseInt(b.css("width")),1<window.devicePixelRatio&&
+"yes"==BJLL.load_hidpi&&(d=Math.ceil(window.devicePixelRatio*d)),c=b.attr("data-lazy-src"),"undefined"!=typeof BJLL.site_url&&"undefined"!=typeof BJLL.network_site_url&&(c=c.replace(BJLL.site_url,BJLL.network_site_url)),d=BJLL.thumb_base+encodeURIComponent(c)+"&w="+d)}b.hide().attr("src",d).removeClass("lazy-hidden").fadeIn()}else"iframe"==d?b.replaceWith(h(b.attr("data-lazy-src"))):"twitter"==d&&(b.replaceWith(h(b.attr("data-lazy-src"))),"undefined"!==typeof twttr&&twttr.widgets.load())}).addClass("data-lazy-ready")}
+function h(c){var b,d,e,k,h,f=0,m=0;k="";var g=[];if(!c)return c;c+="";do b="ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=".indexOf(c.charAt(f++)),d="ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=".indexOf(c.charAt(f++)),k="ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=".indexOf(c.charAt(f++)),h="ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=".indexOf(c.charAt(f++)),e=b<<18|d<<12|k<<6|h,b=e>>16&255,d=e>>8&255,e&=255,64==
+k?g[m++]=String.fromCharCode(b):64==h?g[m++]=String.fromCharCode(b,d):g[m++]=String.fromCharCode(b,d,e);while(f<c.length);return k=g.join("")}e(document).on("ready",m);if("yes"==BJLL.infinite_scroll)e(window).on("scroll",m);e(window).on("resize",function(){e(document).trigger("scroll")})})(jQuery);