diff --git a/change_log.txt b/change_log.txt
index 4385d61a..cbcdeedd 100644
--- a/change_log.txt
+++ b/change_log.txt
@@ -1,6 +1,7 @@
 ===== 3.1.31-dev ===== (xx.xx.xx)
  19.10.2016
   - bugfix {make_nocache $var} did fail when variable value did contain '\' https://github.com/smarty-php/smarty/issues/305
+  - bugfix {make_nocache $var} remove spaces from variable value https://github.com/smarty-php/smarty/issues/304
   
  12.10.2016
   - bugfix {include} with template names including variable or constants could fail after bugfix from
diff --git a/libs/Smarty.class.php b/libs/Smarty.class.php
index 239f3c4b..0459030f 100644
--- a/libs/Smarty.class.php
+++ b/libs/Smarty.class.php
@@ -114,7 +114,7 @@ class Smarty extends Smarty_Internal_TemplateBase
     /**
      * smarty version
      */
-    const SMARTY_VERSION = '3.1.31-dev/35';
+    const SMARTY_VERSION = '3.1.31-dev/36';
 
     /**
      * define variable scopes
diff --git a/libs/sysplugins/smarty_internal_runtime_make_nocache.php b/libs/sysplugins/smarty_internal_runtime_make_nocache.php
index e72e93ce..65382772 100644
--- a/libs/sysplugins/smarty_internal_runtime_make_nocache.php
+++ b/libs/sysplugins/smarty_internal_runtime_make_nocache.php
@@ -23,14 +23,14 @@ class Smarty_Internal_Runtime_Make_Nocache
     public function save(Smarty_Internal_Template $tpl, $var)
     {
         if (isset($tpl->tpl_vars[ $var ])) {
-            $export = preg_replace('/^Smarty_Variable::__set_state[(]|\s|[)]$/', '',
-                                   var_export($tpl->tpl_vars[ $var ], true));
+            $export =
+                preg_replace('/^Smarty_Variable::__set_state[(]|[)]$/', '', var_export($tpl->tpl_vars[ $var ], true));
             if (preg_match('/(\w+)::__set_state/', $export, $match)) {
                 throw new SmartyException("{make_nocache \${$var}} in template '{$tpl->source->name}': variable does contain object '{$match[1]}' not implementing method '__set_state'");
             }
             echo "/*%%SmartyNocache:{$tpl->compiled->nocache_hash}%%*/<?php " .
-                 addcslashes("\$_smarty_tpl->smarty->ext->_make_nocache->store(\$_smarty_tpl, '{$var}', ",
-                             '\\') . $export . ");?>\n/*/%%SmartyNocache:{$tpl->compiled->nocache_hash}%%*/";
+                 addcslashes("\$_smarty_tpl->smarty->ext->_make_nocache->store(\$_smarty_tpl, '{$var}', ", '\\') .
+                 $export . ");?>\n/*/%%SmartyNocache:{$tpl->compiled->nocache_hash}%%*/";
         }
     }