diff --git a/complexity/generate.py b/complexity/generate.py
index 08c00ce..21737be 100755
--- a/complexity/generate.py
+++ b/complexity/generate.py
@@ -12,6 +12,7 @@
 import logging
 import os
 import shutil
+import yaml
 
 from binaryornot.check import is_binary
 from jinja2 import FileSystemLoader
@@ -139,14 +140,14 @@ def generate_context(context_dir):
     """
     Generates the context for all Complexity pages.
 
-    :param context_dir: Directory containing `.json` file(s) to be turned into
-                        context variables for Jinja2.
+    :param context_dir: Directory containing `.json` or '.yml'/'.yaml' file(s)
+                        to be turned into context variables for Jinja2.
 
     Description:
 
-        Iterates through the contents of `context_dir` and finds all JSON
-        files. Loads the JSON file as a Python object with the key being the
-        JSON file name.
+        Iterates through the contents of `context_dir` and finds all JSON/YAML
+        files. Loads the JSON/YAML file as a Python object with the key being
+        the file name.
 
     Example:
 
@@ -167,19 +168,29 @@ def generate_context(context_dir):
     """
     context = {}
 
-    json_files = os.listdir(context_dir)
+    context_files = os.listdir(context_dir)
 
-    for file_name in json_files:
+    for file_name in context_files:
 
-        if file_name.endswith('json'):
+        if os.path.splitext(file_name)[1][1:] in ['yml', 'yaml']:
+
+            # Open the YAML file and convert to Python object
+            context_file = os.path.join(context_dir, file_name)
+            with unicode_open(context_file) as f:
+                obj = yaml.load(f)
+
+            # Add the Python object to the context dictionary
+            context[os.path.splitext(file_name)[0]] = obj
+
+        elif os.path.splitext(file_name)[1][1:] in ['json']:
 
             # Open the JSON file and convert to Python object
-            json_file = os.path.join(context_dir, file_name)
-            with unicode_open(json_file) as f:
+            context_file = os.path.join(context_dir, file_name)
+            with unicode_open(context_file) as f:
                 obj = json.load(f)
 
             # Add the Python object to the context dictionary
-            context[file_name[:-5]] = obj
+            context[os.path.splitext(file_name)[0]] = obj
 
     return context
 
diff --git a/tests/project/context-empty/test.yaml b/tests/project/context-empty/test.yaml
new file mode 100644
index 0000000..e69de29
diff --git a/tests/project/context-yaml/test.yaml b/tests/project/context-yaml/test.yaml
new file mode 100644
index 0000000..678d538
--- /dev/null
+++ b/tests/project/context-yaml/test.yaml
@@ -0,0 +1,6 @@
+{
+    # comment
+    "1": 2,
+    a: "b",
+    multiple: ["c", "d", "e",],
+}
diff --git a/tests/test_generate.py b/tests/test_generate.py
index 14973a2..b890434 100755
--- a/tests/test_generate.py
+++ b/tests/test_generate.py
@@ -213,12 +213,25 @@ def tearDown(self):
 
 
 class TestGenerateContext(unittest.TestCase):
-    def test_generate_context(self):
+    def test_generate_context_json(self):
         context = generate.generate_context(
             context_dir='tests/project/context/'
         )
         self.assertEqual(context, {"test": {"1": 2}})
 
+    def test_generate_context_yaml(self):
+        context = generate.generate_context(
+            context_dir='tests/project/context-yaml/'
+        )
+        self.assertEqual(
+            context, {"test": {"1": 2, "a": "b", "multiple": ["c", "d", "e"]}})
+
+    def test_generate_empty_context_yaml(self):
+        context = generate.generate_context(
+            context_dir='tests/project/context-empty/'
+        )
+        self.assertEqual(context, {"test": None})
+
 
 class TestCopyAssets(unittest.TestCase):
     def test_copy_assets(self):