diff --git a/js/modules/ArDetect.js b/js/modules/ArDetect.js
index 2c5d60e..6ed8d53 100644
--- a/js/modules/ArDetect.js
+++ b/js/modules/ArDetect.js
@@ -160,6 +160,7 @@ class ArDetector {
   start(){
     console.log("%c[ArDetect::setup] Starting automatic aspect ratio detection.", _ard_console_start);
     this._halted = false;
+    this.conf.resizer.resetLastAr();
     this.scheduleFrameCheck(0, true);
   }
 
@@ -171,6 +172,7 @@ class ArDetector {
     this._halted = true;
     clearTimeout(this.setupTimer);
     clearTimeout(this.timer);
+    this.conf.resizer.resetLastAr();
   }
 
   isRunning(){
diff --git a/js/modules/Resizer.js b/js/modules/Resizer.js
index 40a19d8..dbb3d9f 100644
--- a/js/modules/Resizer.js
+++ b/js/modules/Resizer.js
@@ -85,7 +85,6 @@ class Resizer {
     } else if (this.stretcher.mode === StretchMode.HYBRID) {
       var stretchFactors = this.stretcher.calculateStretch(ar);
     } else if (this.stretcher.mode === StretchMode.BASIC) {
-      console.log("basic stretch mode")
       var stretchFactors = this.stretcher.calculateBasicStretch();
     }
 
@@ -95,10 +94,10 @@ class Resizer {
     var translate = this.computeOffsets(stretchFactors);
     this.applyCss(stretchFactors, translate);
 
-    console.log("applied css")
+  }
 
-    // if(! this.destroyed)
-    //   this.startCssWatcher(); 
+  resetLastAr() {
+    this.lastAr = {type: 'original'};
   }
 
   setLastAr(override){
@@ -110,7 +109,6 @@ class Resizer {
   }
 
   setStretchMode(stretchMode){
-    console.log("setting stretch mode:", stretchMode)
     this.stretcher.mode = stretchMode;
     this.restore();
   }
diff --git a/js/modules/Stretcher.js b/js/modules/Stretcher.js
index b0793cd..1c27e94 100644
--- a/js/modules/Stretcher.js
+++ b/js/modules/Stretcher.js
@@ -51,15 +51,37 @@ class Stretcher {
   }
 
   calculateBasicStretch() {
-    console.log("calculating basic stretch - -- stretcher")
-    // var videoAr = this.conf.video.videoWidth / this.conf.video.videoHeight;
-    // var playerAr = this.conf.player.dimensions.width / this.conf.player.dimensions.height;
+    // video.videoWidth in video.videoHeight predstavljata velikost datoteke. 
+    // velikost video datoteke je lahko drugačna kot velikost <video> elementa. 
+    // Zaradi tega lahko pride do te situacije:
+    //     * Ločljivost videa je 850x480 (videoWidth & videoHeight)
+    //     * Velikost <video> značke je 1920x720. 
+    // Znotraj te video značke bo video prikazan v 1280x720 pravokotniku. Raztegovanje
+    // torej hočemo računati z uporabo vrednosti 1280 in 720. Teh vrednosti pa ne
+    // poznamo. Torej jih moramo računati.
+    //
+    //
+    // video.videoWidht and video.videoHeight describe the size of the video file.
+    // Size of the video file can be different than the size of the <video> tag.
+    // This can leave us with the following situation:
+    //     * Video resolution is 850x480-ish (as reported by videoWidth and videoHeight)
+    //     * Size of the <video> tag is 1920x720
+    // The video will be displayed in a 1280x720 rectangle inside that <video> tag. 
+    // This means we want to calculate stretching using those values, but we don't know
+    // them. This means we have to calculate them.
+
+    const videoAr = this.conf.video.videoWidth / this.conf.video.videoHeight;
+    if (this.conf.player.dimensions.width > this.conf.player.dimensions.height * videoAr) {
+      return {
+        xFactor: this.conf.player.dimensions.width / (this.conf.player.dimensions.height * videoAr),
+        yFactor: 1
+      };
+    }
 
     return {
-      xFactor: this.conf.player.dimensions.width / this.conf.video.videoWidth,
-      yFactor: this.conf.player.dimensions.height / this.conf.video.videoHeight
+      xFactor: 1,
+      yFactor: this.conf.player.dimensions.height / (this.conf.player.dimensions.width / videoAr)
     };
-    // return this.calculateStretch(actualAr); 
   }
 
   calculateStretch(actualAr) {