diff --git a/INHERITANCE_RELEASE_NOTES.txt b/INHERITANCE_RELEASE_NOTES.txt
index f3416fea..c415c4cc 100644
--- a/INHERITANCE_RELEASE_NOTES.txt
+++ b/INHERITANCE_RELEASE_NOTES.txt
@@ -1,8 +1,13 @@
-3.1.31
+3.1.31-dev
 New tags for inheritance parent and child
 {block_parent}  == {$smarty.block.parent}
 {block_child}  == {$smarty.block.child}
 
+Since 3.1.28 you can mix inheritance by extends resource with the {extends} tag.
+A template called by extends resource can extend a subtemplate or chain buy the {extends} tag.
+Since 3.1.31 this feature can be turned off by setting the new Smarty property Smarty::$extends_recursion to false.
+
+
 3.1.28
 Starting with version 3.1.28 template inheritance is no longer a compile time process.
 All {block} tag parent/child relations are resolved at run time.
@@ -43,8 +48,8 @@ Any code outside root {block} tags in child templates is now executed but any ou
         ....
    {/block}
 
-Starting with 3.1.28 you can mix inheritance by extends resuorce with the {extends} tag.
-A template called by extends resoure can extend a subtemple or chain buy the {extends} tag.
+Starting with 3.1.28 you can mix inheritance by extends resource with the {extends} tag.
+A template called by extends resource can extend a subtemplate or chain buy the {extends} tag.
 
 NOTE There is a BC break. If you used the extends resource {extends} tags have been ignored.
 
diff --git a/change_log.txt b/change_log.txt
index 0b72ddf8..8f37b13b 100644
--- a/change_log.txt
+++ b/change_log.txt
@@ -1,4 +1,8 @@
 ===== 3.1.31-dev ===== (xx.xx.xx)
+ 29.09.2016
+  - improvement new Smarty::$extends_recursion property to disable execution of {extends} in templates called by extends resource
+     https://github.com/smarty-php/smarty/issues/296
+
  28.09.2016
   - bugfix the generated code for calling a subtemplate must pass the template resource name in single quotes https://github.com/smarty-php/smarty/issues/299
   - bugfix nocache hash was not removed for <?xml ?> tags in subtemplates https://github.com/smarty-php/smarty/issues/300