2 files changed, 6 insertions, 1 deletions
diff --git a/lib/parse/lex.js b/lib/parse/lex.js
index 6b3236e..def74b4 100644
--- a/lib/parse/lex.js
+++ b/lib/parse/lex.js
@@ -23,7 +23,10 @@ function sectionType(nodes, idx) {
         type: 'code'
     }).length;
 
-    if(codeNodes === 3 && (idx % 2) == 1) {
+    if(
+        (codeNodes === 3 || codeNodes === 4) &&
+        (idx % 2) === 1)
+    {
         return 'exercise';
     }
 
diff --git a/lib/parse/page.js b/lib/parse/page.js
index 56a9e60..3479c85 100644
--- a/lib/parse/page.js
+++ b/lib/parse/page.js
@@ -72,6 +72,8 @@ function parsePage(src, options) {
                     base: codeNodes[0].text,
                     solution: codeNodes[1].text,
                     validation: codeNodes[2].text,
+                    // Context is optional
+                    context: codeNodes[3] ? codeNodes[3].text : null,
                 }
             };
         }