diff --git a/README.md b/README.md
index 98df110..40e1a8b 100644
--- a/README.md
+++ b/README.md
@@ -73,6 +73,7 @@ There are additional inputs if you want to be able to assign issues to projects.
 * C++
 * C#
 * CSS
+* Crystal
 * Dart
 * Elixir
 * Go
diff --git a/syntax.json b/syntax.json
index 60f79c7..374112e 100644
--- a/syntax.json
+++ b/syntax.json
@@ -591,5 +591,14 @@
         }
       }
     ]
+  },
+  {
+    "language": "Crystal",
+    "markers": [
+      {
+        "type": "line",
+        "pattern": "#"
+      }
+    ]
   }
 ]
diff --git a/tests/test_closed.diff b/tests/test_closed.diff
index f42c460..d7190f1 100644
--- a/tests/test_closed.diff
+++ b/tests/test_closed.diff
@@ -75,6 +75,17 @@ index 525e25d..ba4e68d 100644
 -    kept together as one.
 -    '''
 -    pass
+diff --git a/tests/example_file.cr b/tests/example_file.cr
+index e6da2ec..67f14dd 100644
+--- a/tests/example_file.cr
++++ b/tests/example_file.cr
+@@ -1,14 +1,3 @@
+-# TODO: Come up with a more imaginative greeting
+ puts "Greetings"
+-
+-# TODO: Do even more stuff
+-# This function should probably do something more interesting
+-# labels: help wanted
 diff --git a/tests/example_file.rb b/tests/example_file.rb
 index e6da2ec..67f14dd 100644
 --- a/tests/example_file.rb
@@ -210,4 +221,4 @@ index 525e25d..ba4e68d 100644
 -   TODO:Multiline comments
 -   also need to be turned into todos, and hopefully
 -   kept together as one todo
-- #}
\ No newline at end of file
+- #}
diff --git a/tests/test_new.diff b/tests/test_new.diff
index 805b2a2..690698e 100644
--- a/tests/test_new.diff
+++ b/tests/test_new.diff
@@ -78,6 +78,18 @@ index 0000000..525e25d
 +    '''
 +    pass
 \ No newline at end of file
+diff --git a/tests/example_file.cr b/tests/example_file.cr
+new file mode 100644
+index 0000000..e6da2ec
+--- /dev/null
++++ b/tests/example_file.cr
+@@ -0,0 +1,14 @@
++# TODO: Come up with a more imaginative greeting
++puts "Greetings"
++
++# TODO: Do even more stuff
++# This function should probably do something more interesting
++# labels: help wanted
 diff --git a/tests/example_file.rb b/tests/example_file.rb
 new file mode 100644
 index 0000000..e6da2ec
diff --git a/tests/test_todo_parser.py b/tests/test_todo_parser.py
index aaf40af..b737451 100644
--- a/tests/test_todo_parser.py
+++ b/tests/test_todo_parser.py
@@ -33,8 +33,12 @@ class NewIssueTests(unittest.TestCase):
     def test_java_issues(self):
         self.assertEqual(count_issues_for_file_type(self.raw_issues, 'java'), 2)
 
+    def test_crystal_issues(self):
+        self.assertEqual(count_issues_for_file_type(self.raw_issues, 'crystal'), 2)
+
     def test_ruby_issues(self):
-        self.assertEqual(count_issues_for_file_type(self.raw_issues, 'ruby'), 3)
+        # Includes 2 tests for Crystal.
+        self.assertEqual(count_issues_for_file_type(self.raw_issues, 'ruby'), 5)
 
     def test_abap_issues(self):
         self.assertEqual(count_issues_for_file_type(self.raw_issues, 'abap'), 2)
@@ -50,10 +54,10 @@ class NewIssueTests(unittest.TestCase):
 
     def test_autohotkey_issues(self):
         self.assertEqual(count_issues_for_file_type(self.raw_issues, 'autohotkey'), 1)
-    
+
     def test_handlebars_issues(self):
         self.assertEqual(count_issues_for_file_type(self.raw_issues, 'handlebars'), 2)
-    
+
     def test_org_issues(self):
         self.assertEqual(count_issues_for_file_type(self.raw_issues, 'text'), 2)
 
@@ -86,7 +90,8 @@ class ClosedIssueTests(unittest.TestCase):
         self.assertEqual(count_issues_for_file_type(self.raw_issues, 'java'), 2)
 
     def test_ruby_issues(self):
-        self.assertEqual(count_issues_for_file_type(self.raw_issues, 'ruby'), 3)
+        # Includes 2 tests for Crystal.
+        self.assertEqual(count_issues_for_file_type(self.raw_issues, 'ruby'), 5)
 
     def test_abap_issues(self):
         self.assertEqual(count_issues_for_file_type(self.raw_issues, 'abap'), 2)
@@ -96,16 +101,16 @@ class ClosedIssueTests(unittest.TestCase):
 
     def test_tex_issues(self):
         self.assertEqual(count_issues_for_file_type(self.raw_issues, 'tex'), 2)
-    
+
     def test_julia_issues(self):
         self.assertEqual(count_issues_for_file_type(self.raw_issues, 'julia'), 2)
 
     def test_autohotkey_issues(self):
         self.assertEqual(count_issues_for_file_type(self.raw_issues, 'autohotkey'), 1)
-    
+
     def test_handlebars_issues(self):
         self.assertEqual(count_issues_for_file_type(self.raw_issues, 'handlebars'), 2)
-    
+
     def test_org_issues(self):
         self.assertEqual(count_issues_for_file_type(self.raw_issues, 'text'), 2)