diff --git a/lib/Utils.js b/lib/Utils.js
index 61d0d67..25fd6db 100644
--- a/lib/Utils.js
+++ b/lib/Utils.js
@@ -167,5 +167,5 @@ exports.getOpenSubtitlesLanguage = function(lang){
         }
     });
 
-    return languages[lang] || lang;
+    return languages[lang] || opensubLanguage || lang;
 };
diff --git a/lib/UtilsSpec.js b/lib/UtilsSpec.js
index 513dff9..c500bc7 100644
--- a/lib/UtilsSpec.js
+++ b/lib/UtilsSpec.js
@@ -10,7 +10,7 @@ describe('indexSpec', function(){
 
     });
 
-  
+
     it('.getOpenSubtitlesLanguage()', function(done){
 
         var Utils = require('./Utils');
@@ -22,8 +22,25 @@ describe('indexSpec', function(){
         expect(lang).to.be('pob');
 
         done();
-        
     });
 
-  
-});
\ No newline at end of file
+    it('.getOpenSubtitlesLanguage() es_ES', function(done){
+
+        var Utils = require('./Utils');
+
+        var lang = Utils.getOpenSubtitlesLanguage('es_ES');
+        expect(lang).to.be('spa');
+
+        done();
+    });
+
+    it('.getOpenSubtitlesLanguage .UTF-8', function(done){
+        var Utils = require('./Utils');
+
+        var lang = Utils.getOpenSubtitlesLanguage('es_ES.UTF-8');
+        expect(lang).to.be('spa');
+
+        done();
+    });
+
+});