diff --git a/Themes/default/scripts/ohyoutube.js b/Themes/default/scripts/ohyoutube.js
index 781dc9c..0169422 100644
--- a/Themes/default/scripts/ohyoutube.js
+++ b/Themes/default/scripts/ohyoutube.js
@@ -1,7 +1,7 @@
 /*
  Copyright (C) 2016 Jessica González
  @license http://www.mozilla.org/MPL/ MPL 2.0
- @version 1.2.6
+ @version 1.2.7
 */
 
 var _oh = function(){
@@ -10,6 +10,8 @@ var _oh = function(){
 	this.defaultWidth = typeof(_ohWidth) !== 'undefined' ? _ohWidth : 480;
 	this.defaultHeight = typeof(_ohHeight) !== 'undefined' ? _ohHeight : 270;
 	this.aspectRatio = this.defaultHeight / this.defaultWidth;
+	this.basedWidth = this.basedElement.width() >= this.defaultWidth ? this.defaultWidth : this.basedElement.width();
+	this.basedHeight = this.basedElement.height() >= this.defaultHeight ? this.defaultHeight : this.basedElement.height();
 
 	this.main();
 	this.responsive();
@@ -24,8 +26,8 @@ _oh.prototype.main = function(){
 		var _element = $(this);
 			_element.videoID = this.id.replace('oh_','');
 			_element.imgsrc = $this.getImage(_element.videoID);
-			_element.imgHeight = $this.basedElement.height();
-			_element.imgWidth = $this.basedElement.width();
+			_element.imgHeight = $this.basedHeight;
+			_element.imgWidth = $this.basedWidth;
 
 		if (typeof _element.imgsrc !== 'undefined'){
 			_element.css({'background-image': 'url('+ _element.imgsrc +')', 'background-size': 'cover'});
@@ -118,4 +120,4 @@ _oh.prototype.getImage = function(youtubeID)
 			_ohObject.refresh();
 		});
 	});
-})(jQuery);
+})(jQuery);
\ No newline at end of file
diff --git a/Themes/default/scripts/ohyoutube.min.js b/Themes/default/scripts/ohyoutube.min.js
index a43e918..675b198 100644
--- a/Themes/default/scripts/ohyoutube.min.js
+++ b/Themes/default/scripts/ohyoutube.min.js
@@ -1,11 +1,11 @@
 /*
  Copyright (C) 2016 Jessica González
- @license //www.mozilla.org/MPL/ MPL 2.0
- @version 1.2.6
+ @license http://www.mozilla.org/MPL/ MPL 2.0
+ @version 1.2.7
 */
 
-var _oh=function(){this.masterDiv=$(".oharaEmbed");this.basedElement=this.masterDiv.parent();this.defaultWidth="undefined"!==typeof _ohWidth?_ohWidth:480;this.defaultHeight="undefined"!==typeof _ohHeight?_ohHeight:270;this.aspectRatio=this.defaultHeight/this.defaultWidth;this.main();this.responsive()};
-_oh.prototype.main=function(){var b=this;$(".youtube").each(function(){var a=$(this);a.videoID=this.id.replace("oh_","");a.imgsrc=b.getImage(a.videoID);a.imgHeight=b.basedElement.height();a.imgWidth=b.basedElement.width();"undefined"!==typeof a.imgsrc&&a.css({"background-image":"url("+a.imgsrc+")","background-size":"cover"});a.append($("<div/>",{"class":"youtube_play"}));a.one("click",function(){var b="//www.youtube.com/embed/"+a.videoID+"?autoplay=1&autohide=1";a.data("params")&&(b+="&"+a.data("params"));
-b=$("<iframe/>",{frameborder:"0",src:b,width:a.imgWidth,height:a.imgHeight,allowfullscreen:"allowfullscreen"});a.css({"background-image":"none"}).append(b);a.children(".youtube_play").css({height:"0"})})});b.responsive()};
+var _oh=function(){this.masterDiv=$(".oharaEmbed");this.basedElement=this.masterDiv.parent();this.defaultWidth="undefined"!==typeof _ohWidth?_ohWidth:480;this.defaultHeight="undefined"!==typeof _ohHeight?_ohHeight:270;this.aspectRatio=this.defaultHeight/this.defaultWidth;this.basedWidth=this.basedElement.width()>=this.defaultWidth?this.defaultWidth:this.basedElement.width();this.basedHeight=this.basedElement.height()>=this.defaultHeight?this.defaultHeight:this.basedElement.height();this.main();this.responsive()};
+_oh.prototype.main=function(){var b=this;$(".youtube").each(function(){var a=$(this);a.videoID=this.id.replace("oh_","");a.imgsrc=b.getImage(a.videoID);a.imgHeight=b.basedHeight;a.imgWidth=b.basedWidth;"undefined"!==typeof a.imgsrc&&a.css({"background-image":"url("+a.imgsrc+")","background-size":"cover"});a.append($("<div/>",{"class":"youtube_play"}));a.one("click",function(){var b="//www.youtube.com/embed/"+a.videoID+"?autoplay=1&autohide=1";a.data("params")&&(b+="&"+a.data("params"));b=$("<iframe/>",
+{frameborder:"0",src:b,width:a.imgWidth,height:a.imgHeight,allowfullscreen:"allowfullscreen"});a.css({"background-image":"none"}).append(b);a.children(".youtube_play").css({height:"0"})})});b.responsive()};
 _oh.prototype.responsive=function(){$this=this;$(window).resize(function(){var b=$this.basedElement.width();newHeight=b*$this.aspectRatio<=$this.defaultHeight?b*$this.aspectRatio:$this.defaultHeight;var a=b<=$this.defaultWidth,c=a?b:$this.defaultWidth,d=a?newHeight:$this.defaultHeight;0>=c&&0>=d&&(c=$this.defaultWidth,d=$this.defaultHeight);$this.masterDiv.width(c).height(d);$(".oharaEmbed > iframe").each(function(){$(this).width(c).height(d)})}).resize()};
 _oh.prototype.refresh=function(){$this=this;setTimeout(function(){$this.main()},3E3);setTimeout(function(){$this.responsive()},3E3)};_oh.prototype.getImage=function(b){var a="",c,d,e=["hqdefault","mqdefault","sddefault","maxresdefault"];c=0;for(d=e.length;c<d&&(a="//i.ytimg.com/vi/"+b+"/"+e[c]+".jpg",0==a.width);++c);0==a.width&&(a="//i.ytimg.com/vi/"+b+"/default.jpg");return a};(function(b){b(function(){var a=new _oh;b("input[name=preview]").on("click",function(){a.refresh()})})})(jQuery);
\ No newline at end of file