diff --git a/behat/symfony2-extension/2.1/features/bootstrap/FeatureContext.php b/behat/symfony2-extension/2.1/features/bootstrap/FeatureContext.php
index 3fbc2517..23e3386a 100644
--- a/behat/symfony2-extension/2.1/features/bootstrap/FeatureContext.php
+++ b/behat/symfony2-extension/2.1/features/bootstrap/FeatureContext.php
@@ -5,6 +5,12 @@ use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpKernel\KernelInterface;
 
+/**
+ * This context class contains the definitions of the steps used by the demo 
+ * feature file. Learn how to get started with Behat and BDD on Behat's website.
+ * 
+ * @see http://behat.org/en/latest/quick_start.html
+ */
 class FeatureContext implements Context
 {
     /**
diff --git a/behat/symfony2-extension/2.1/features/demo.feature b/behat/symfony2-extension/2.1/features/demo.feature
index 31bf16dd..295db96e 100644
--- a/behat/symfony2-extension/2.1/features/demo.feature
+++ b/behat/symfony2-extension/2.1/features/demo.feature
@@ -1,3 +1,7 @@
+# This file contains a user story for demonstration only.
+# Learn how to get started with Behat and BDD on Behat's website:
+# http://behat.org/en/latest/quick_start.html
+
 Feature:
   In order to prove that the Behat Symfony extension is correctly installed
   As a user