diff --git a/sentiment-basic/sentiment-basic.py b/sentiment-basic/sentiment-basic.py
index 6eb9892..eea2d69 100644
--- a/sentiment-basic/sentiment-basic.py
+++ b/sentiment-basic/sentiment-basic.py
@@ -70,23 +70,23 @@ class SentiTextPlugin(SentimentPlugin):
 
     def analyse_entry(self, entry, params):
 
-        language = params.get("language","eng")
+        language = params.get("language")
         text = entry.get("text", None)
         tokens = self._tokenize(text)
         tokens = self._pos(tokens)
-        
+        sufixes = {'es':'spa','en':'eng','it':'ita','fr':'fra'}
         for i in tokens:
             tokens[i]['lemmas'] = {}
             for w in tokens[i]['tokens']:
-                lemmas = wn.lemmas(w[0], lang=language)
+                lemmas = wn.lemmas(w[0], lang=sufixes[language])
                 if len(lemmas) == 0:
                     continue
                 tokens[i]['lemmas'][w[0]] = lemmas
 
-        if language == "eng":
+        if language == "en":
             trans = TextBlob(unicode(text))
         else:
-            trans = TextBlob(unicode(text)).translate(from_lang=TextBlob(unicode(text)).detect_language(),to='en')
+            trans = TextBlob(unicode(text)).translate(from_lang=language,to='en')
         useful_synsets = {}
         for s_i, t_s in enumerate(trans.sentences):
             useful_synsets[s_i] = {}
diff --git a/sentiment-basic/sentiment-basic.senpy b/sentiment-basic/sentiment-basic.senpy
index c152739..f6d8a7d 100644
--- a/sentiment-basic/sentiment-basic.senpy
+++ b/sentiment-basic/sentiment-basic.senpy
@@ -13,7 +13,7 @@
         "language": {
             "aliases": ["language", "l"],
             "required": true,
-            "options": ["eng","spa", "ita", "fra", "auto"],
+            "options": ["en","es", "it", "fr", "auto"],
             "default": "auto"
         },
     },