diff --git a/includes/locale.php b/includes/locale.php
index a123b17a..19119af1 100755
--- a/includes/locale.php
+++ b/includes/locale.php
@@ -5,6 +5,15 @@
 *
 */
 
+
+/** 
+* Rudimentary language detection via the browser.
+* Accept-Language returns a list of weighted values with a quality (or 'q') parameter.
+* A better method would parse the list of preferred languages and match this with 
+* the languages supported by out platform.
+*
+* Refer to: https://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html#sec14.4
+*/
 if (!isset($_SESSION["locale"])) {
   $lang = substr($_SERVER['HTTP_ACCEPT_LANGUAGE'], 0, 2);
   switch ($lang){
@@ -16,15 +25,19 @@ if (!isset($_SESSION["locale"])) {
       break;
     case "it":
       $locale = "it_IT.UTF-8";
-      break;        
+      break; 
+    case "es":
+      $locale = "es_ES.UTF-8";
+      break;       
     default:
       $locale = "en_US.UTF-8";
       break;
   }
 }
 
-// debug
-$locale = "fr_FR.UTF-8";
+// Uncomment for testing
+// Note: the associated locale must be installed on the RPi 
+//$locale = "fr_FR.UTF-8";
 $_SESSION["locale"] = $locale;                                                                                                                                                                                          
 // activate the locale setting                                                                                                                                                            
 putenv("LANG=" . $_SESSION["locale"]);