diff --git a/language-config.h b/language-config.h
index 948c39d..0411e80 100644
--- a/language-config.h
+++ b/language-config.h
@@ -9,6 +9,8 @@
 #define LANGUAGES "en"
 // language key in the configuration file
 #define LANGUAGE_KEY "LANGUAGE"
+// name of config section in the file if any
+#define LANGUAGE_SECTION "Common"
 
 
 #endif /* LANGUAGE_CONFIG_H */
diff --git a/language.cpp b/language.cpp
index ce47422..51b7165 100644
--- a/language.cpp
+++ b/language.cpp
@@ -21,11 +21,18 @@
 #include <QFile>
 #include <QLocale>
 #include <QSettings>
+#include <QRegExp>
 
 #include "config.h"
 
 
-Language::Language()
+Language::Language(QObject *parent)
+    : QObject(parent)
+{
+}
+
+
+Language::~Language()
 {
 }
 
@@ -33,30 +40,33 @@ Language::Language()
 QString Language::checkLanguage(const QString language)
 {
     QStringList availableLanguages = getAvailableLanguages();
-    if (availableLanguages.count() == 0) return QString("");
-    for (int i=0; i<availableLanguages.count(); i++)
-        if (language == availableLanguages[i])
-            return availableLanguages[i];
-    for (int i=0; i<availableLanguages.count(); i++)
-        if (language.contains(availableLanguages[i] + QChar('_')))
-            return availableLanguages[i];
+    if (availableLanguages.isEmpty()) return QString();
 
-    return availableLanguages[0];
+    QStringList filtered = availableLanguages.filter(language);
+    filtered.append(availableLanguages.filter(QRegExp(QString("^%1").arg(language.split(QChar('_'))[0]))));
+
+    if (filtered.isEmpty())
+        return availableLanguages[0];
+    else
+        return filtered[0];
 }
 
 
 QString Language::defineLanguage(const QString configPath, const QString options)
 {
-    QMap<QString, QString> optionsDict = parseOptions(options);
-    if (optionsDict.contains(QString(LANGUAGE_KEY)))
-        if (getAvailableLanguages().contains(optionsDict[QString(LANGUAGE_KEY)]))
-            return optionsDict[QString(LANGUAGE_KEY)];
+    // create instance
+    Language *langObject = new Language(nullptr);
 
-    QString language;
-    language = defineLanguageFromFile(configPath);
+    // define language
+    QString language = langObject->parseOptions(options);
     if (language.isEmpty())
-        language = defineLanguageFromLocale();
-    language = checkLanguage(language);
+        language = langObject->defineLanguageFromFile(configPath);
+    if (language.isEmpty())
+        language = langObject->defineLanguageFromLocale();
+    language = langObject->checkLanguage(language);
+
+    // clear
+    delete langObject;
 
     return language;
 }
@@ -66,7 +76,7 @@ QString Language::defineLanguageFromFile(const QString configPath)
 {
     QSettings settings(configPath, QSettings::IniFormat);
 
-    settings.beginGroup("Common");
+    settings.beginGroup(QString(LANGUAGE_SECTION));
     QString language = settings.value(QString(LANGUAGE_KEY), QString()).toString();
     settings.endGroup();
 
@@ -86,14 +96,14 @@ QStringList Language::getAvailableLanguages()
 }
 
 
-QMap<QString, QString> Language::parseOptions(const QString options)
+QString Language::parseOptions(const QString options)
 {
-    QMap<QString, QString> optionsDict;
+    QString language;
     for (int i=0; i<options.split(QChar(',')).count(); i++) {
         if (options.split(QChar(','))[i].split(QChar('=')).count() < 2) continue;
-        optionsDict[options.split(QChar(','))[i].split(QChar('='))[0]] =
-                options.split(QChar(','))[i].split(QChar('='))[1];
+        if (options.split(QChar(','))[i].split(QChar('='))[0] != QString(LANGUAGE_KEY)) continue;
+        language = options.split(QChar(','))[i].split(QChar('='))[1];
     }
 
-    return optionsDict;
+    return language;
 }
diff --git a/language.h b/language.h
index bc906b2..df00343 100644
--- a/language.h
+++ b/language.h
@@ -19,6 +19,7 @@
 #define LANGUAGE_H
 
 #include <QStringList>
+#include <QObject>
 
 
 class Language : public QObject
@@ -26,16 +27,17 @@ class Language : public QObject
     Q_OBJECT
 
 public:
-    explicit Language();
-    static QString checkLanguage(const QString language);
+    explicit Language(QObject *parent);
+    virtual ~Language();
     static QString defineLanguage(const QString configPath,
                                   const QString options = QString("OPTIONS"));
-    static QString defineLanguageFromFile(const QString configPath);
-    static QString defineLanguageFromLocale();
     static QStringList getAvailableLanguages();
 
 private:
-    static QMap<QString, QString> parseOptions(const QString options);
+    QString checkLanguage(const QString language);
+    QString defineLanguageFromFile(const QString configPath);
+    QString defineLanguageFromLocale();
+    QString parseOptions(const QString options);
 };