diff --git a/dev-requirements.txt b/dev-requirements.txt
index 834a888..568f943 100644
--- a/dev-requirements.txt
+++ b/dev-requirements.txt
@@ -3,4 +3,5 @@ mock==2.0.0
 nose==1.3.7
 nose-capturestderr==1.2
 nose-exclude==0.5.0
+nose-watch==0.9.1
 testfixtures==5.0.0
diff --git a/tests/samples/codefiles/matlab/empty.m b/tests/samples/codefiles/matlab/empty.m
new file mode 100644
index 0000000..e69de29
diff --git a/tests/samples/codefiles/matlab/matlab.m b/tests/samples/codefiles/matlab/matlab.m
new file mode 100755
index 0000000..11259e5
--- /dev/null
+++ b/tests/samples/codefiles/matlab/matlab.m
@@ -0,0 +1,10 @@
+function foo = bar(a, b, c)
+
+% This is a variable
+avariables = 0;
+
+% =============================================================
+% This is a Matlab comment
+% =============================================================
+
+end
diff --git a/tests/samples/codefiles/matlab/with_mat_files/empty.m b/tests/samples/codefiles/matlab/with_mat_files/empty.m
new file mode 100644
index 0000000..e69de29
diff --git a/tests/samples/codefiles/matlab/with_mat_files/empty.mat b/tests/samples/codefiles/matlab/with_mat_files/empty.mat
new file mode 100644
index 0000000..e69de29
diff --git a/tests/test_languages.py b/tests/test_languages.py
index 0af44c6..54f2b23 100644
--- a/tests/test_languages.py
+++ b/tests/test_languages.py
@@ -237,3 +237,51 @@ class LanguagesTestCase(utils.TestCase):
 
         language = u('F#')
         self.assertEqual(self.patched['wakatime.offlinequeue.Queue.push'].call_args[0][0].get('language'), language)
+
+    def test_objectivec_detected_over_matlab_when_file_empty(self):
+        response = Response()
+        response.status_code = 500
+        self.patched['wakatime.packages.requests.adapters.HTTPAdapter.send'].return_value = response
+
+        now = u(int(time.time()))
+        config = 'tests/samples/configs/good_config.cfg'
+        entity = 'tests/samples/codefiles/matlab/empty.m'
+        args = ['--file', entity, '--config', config, '--time', now]
+
+        retval = execute(args)
+        self.assertEquals(retval, 102)
+
+        language = u('Objective-C')
+        self.assertEqual(self.patched['wakatime.offlinequeue.Queue.push'].call_args[0][0].get('language'), language)
+
+    def test_matlab_detected(self):
+        response = Response()
+        response.status_code = 500
+        self.patched['wakatime.packages.requests.adapters.HTTPAdapter.send'].return_value = response
+
+        now = u(int(time.time()))
+        config = 'tests/samples/configs/good_config.cfg'
+        entity = 'tests/samples/codefiles/matlab/matlab.m'
+        args = ['--file', entity, '--config', config, '--time', now]
+
+        retval = execute(args)
+        self.assertEquals(retval, 102)
+
+        language = u('Matlab')
+        self.assertEqual(self.patched['wakatime.offlinequeue.Queue.push'].call_args[0][0].get('language'), language)
+
+    def test_matlab_detected_over_objectivec_when_mat_file_in_folder(self):
+        response = Response()
+        response.status_code = 500
+        self.patched['wakatime.packages.requests.adapters.HTTPAdapter.send'].return_value = response
+
+        now = u(int(time.time()))
+        config = 'tests/samples/configs/good_config.cfg'
+        entity = 'tests/samples/codefiles/matlab/with_mat_files/empty.m'
+        args = ['--file', entity, '--config', config, '--time', now]
+
+        retval = execute(args)
+        self.assertEquals(retval, 102)
+
+        language = u('Matlab')
+        self.assertEqual(self.patched['wakatime.offlinequeue.Queue.push'].call_args[0][0].get('language'), language)
diff --git a/wakatime/language_priorities.py b/wakatime/language_priorities.py
index 8ae7848..cb7d185 100644
--- a/wakatime/language_priorities.py
+++ b/wakatime/language_priorities.py
@@ -11,8 +11,8 @@
 
 
 LANGUAGES = {
-    'typescript': 0.01,
+    'f#': 0.01,
     'perl': 0.01,
     'perl6': 0.01,
-    'f#': 0.01,
+    'typescript': 0.01,
 }
diff --git a/wakatime/packages/pygments/lexers/matlab.py b/wakatime/packages/pygments/lexers/matlab.py
index 56a0f6d..02a90bb 100644
--- a/wakatime/packages/pygments/lexers/matlab.py
+++ b/wakatime/packages/pygments/lexers/matlab.py
@@ -134,9 +134,9 @@ class MatlabLexer(RegexLexer):
     }
 
     def analyse_text(text):
-        if re.match('^\s*%', text, re.M):  # comment
+        if re.search(r'^\s*%', text, re.M):  # comment
             return 0.2
-        elif re.match('^!\w+', text, re.M):  # system cmd
+        elif re.search(r'^!\w+', text, re.M):  # system cmd
             return 0.2
 
 
diff --git a/wakatime/stats.py b/wakatime/stats.py
index e6fc3ff..18203be 100644
--- a/wakatime/stats.py
+++ b/wakatime/stats.py
@@ -172,10 +172,7 @@ def get_language_from_extension(file_name):
         if os.path.exists(u('{0}{1}').format(u(filepart), u('.c'))) or os.path.exists(u('{0}{1}').format(u(filepart), u('.C'))):
             return 'C'
 
-        directory = os.path.dirname(file_name)
-        available_files = os.listdir(directory)
-        available_extensions = list(zip(*map(os.path.splitext, available_files)))[1]
-        available_extensions = [ext.lower() for ext in available_extensions]
+        available_extensions = extensions_in_same_folder(file_name)
         if '.cpp' in available_extensions:
             return 'C++'
         if '.c' in available_extensions:
@@ -300,7 +297,7 @@ def custom_pygments_guess_lexer_for_filename(_fn, _text, **options):
         rv = lexer.analyse_text(_text)
         if rv == 1.0:
             return lexer(**options)
-        result.append((rv, customize_priority(lexer)))
+        result.append(customize_lexer_priority(_fn, rv, lexer))
 
     def type_sort(t):
         # sort by:
@@ -308,16 +305,40 @@ def custom_pygments_guess_lexer_for_filename(_fn, _text, **options):
         # - is primary filename pattern?
         # - priority
         # - last resort: class name
-        return (t[0], primary[t[1]], t[1].priority, t[1].__name__)
+        return (t[0], primary[t[2]], t[1], t[2].__name__)
     result.sort(key=type_sort)
 
-    return result[-1][1](**options)
+    return result[-1][2](**options)
 
 
-def customize_priority(lexer):
-    """Return an integer priority for the given lexer object."""
+def customize_lexer_priority(file_name, accuracy, lexer):
+    """Customize lexer priority"""
+
+    priority = lexer.priority
 
     lexer_name = lexer.name.lower().replace('sharp', '#')
     if lexer_name in LANGUAGES:
-        lexer.priority = LANGUAGES[lexer_name]
-    return lexer
+        priority = LANGUAGES[lexer_name]
+    elif lexer_name == 'matlab':
+        available_extensions = extensions_in_same_folder(file_name)
+        if '.mat' in available_extensions:
+            priority = 0.06
+
+    return (accuracy, priority, lexer)
+
+
+EXTENSION_CACHE = {}
+def extensions_in_same_folder(file_name):
+    """Returns a list of file extensions from the same folder as file_name."""
+    global EXTENSION_CACHE
+
+    if file_name in EXTENSION_CACHE:
+        return EXTENSION_CACHE[file_name]
+
+    directory = os.path.dirname(file_name)
+    files = os.listdir(directory)
+    extensions = list(zip(*map(os.path.splitext, files)))[1]
+    extensions = set([ext.lower() for ext in extensions])
+
+    EXTENSION_CACHE[file_name] = extensions
+    return extensions