diff --git a/src/plugins/jquery.plugin.html2canvas.js b/src/plugins/jquery.plugin.html2canvas.js
index cb784f3..78460f5 100644
--- a/src/plugins/jquery.plugin.html2canvas.js
+++ b/src/plugins/jquery.plugin.html2canvas.js
@@ -1,117 +1,46 @@
-
 /*
  * jQuery helper plugin for examples and tests
  */
-			
 (function( $ ){
     $.fn.html2canvas = function(options) {
-  
-        var date = new Date();
-        var message,
-        timeoutTimer,
+        var date = new Date(),
+        $message = null,
+        timeoutTimer = false,
         timer = date.getTime();
-       
-        var preload = html2canvas.Preload(this[0], {
-            "complete": function(images){
-                
-                var queue = html2canvas.Parse(this[0], images);
-               
-                
-                var canvas = $(html2canvas.Renderer(queue));
-                var finishTime = new Date();
-         
-          
-                canvas.css('position','absolute')
-                .css('left',0).css('top',0);
-                $('body').append(canvas);
-                $(canvas).siblings().toggle();
-                
-           
-                
+	html2canvas.logging = options && options.logging;
+        html2canvas.Preload(this[0], $.extend({
+            complete: function(images){
+                var queue = html2canvas.Parse(this[0], images, options),
+                $canvas = $(html2canvas.Renderer(queue, options)),
+                finishTime = new Date();
+
+                $canvas.css({ position: 'absolute', left: 0, top: 0 }).appendTo(document.body);
+                $canvas.siblings().toggle();
+
                 $(window).click(function(){
-                    if (!canvas.is(':visible')){
-                        $(canvas).toggle().siblings().toggle();  
+                    if (!$canvas.is(':visible')){
+                        $canvas.toggle().siblings().toggle();
                         throwMessage("Canvas Render visible");
                     } else{
-                        $(canvas).siblings().toggle();  
-                        $(canvas).toggle();
+                        $canvas.siblings().toggle();
+                        $canvas.toggle();
                         throwMessage("Canvas Render hidden");
                     }
-                    
-          
                 });
                 throwMessage('Screenshot created in '+ ((finishTime.getTime()-timer)/1000) + " seconds<br />",4000);
-                  
             }
-        });
-       
-  
-       
+        }, options));
 
-         
-
-      
-        /*
-        var date = new Date();
-        var message,
-        timeoutTimer,
-        timer = date.getTime();
-        
-        var object = $.extend({},{
-            logging: false,
-            proxyUrl: "http://html2canvas.appspot.com/", // running html2canvas-python proxy
-            ready: function(renderer) {
-                
-                var finishTime = new Date();
-               // console.log((finishTime.getTime()-timer)/1000);
-                
-
-                document.body.appendChild(renderer.canvas);
-                
-                
-                
-                var canvas = $(renderer.canvas);
-                canvas.css('position','absolute')
-                .css('left',0).css('top',0);
-                
-
-                
-               // $('body').append(canvas);
-                $(canvas).siblings().toggle();
-                
-                throwMessage('Screenshot created in '+ ((finishTime.getTime()-timer)/1000) + " seconds<br />Total of "+renderer.numDraws+" draws performed",4000);
-                
-                
-                $(window).click(function(){
-                    if (!canvas.is(':visible')){
-                        $(canvas).toggle().siblings().toggle();  
-                        throwMessage("Canvas Render visible");
-                    } else{
-                        $(canvas).siblings().toggle();  
-                        $(canvas).toggle();
-                        throwMessage("Canvas Render hidden");
-                    }
-                    
-          
-                });
-            }
-            
-        },options)
-        
-        new html2canvas(this.get(0), object);
-        
-         */
-        
         function throwMessage(msg,duration){
-            
             window.clearTimeout(timeoutTimer);
             timeoutTimer = window.setTimeout(function(){
-                message.fadeOut(function(){
-                    message.remove();   
-                });                   
+                $message.fadeOut(function(){
+                    $message.remove();
+                });
             },duration || 2000);
-            $(message).remove();
-            message = $('<div />').html(msg).css({
+            if ($message)
+                $message.remove();
+            $message = $('<div />').html(msg).css({
                 margin:0,
                 padding:10,
                 background: "#000",
@@ -119,7 +48,7 @@
                 position:"fixed",
                 top:10,
                 right:10,
-                fontFamily: 'Tahoma' ,
+                fontFamily: 'Tahoma',
                 color:'#fff',
                 fontSize:12,
                 borderRadius:12,
@@ -129,8 +58,5 @@
                 textDecoration:'none'
             }).hide().fadeIn().appendTo('body');
         }
-
     };
-   
 })( jQuery );
-	
\ No newline at end of file