diff --git a/HISTORY.rst b/HISTORY.rst
index 6b9c5e15..526dfb64 100644
--- a/HISTORY.rst
+++ b/HISTORY.rst
@@ -7,6 +7,8 @@ PlatformIO 3.0
 3.2.2 (2016-12-??)
 ~~~~~~~~~~~~~~~~~~
 
+* Added support for templated methods in "*.ino to *.cpp" convertor
+  (`pull #858 <https://github.com/platformio/platformio-core/pull/858>`_)
 * Produce less noisy output when ``-s/--silent`` options are used for
   `platformio init <http://docs.platformio.org/page/userguide/cmd_init.html>`__
   and `platformio run <http://docs.platformio.org/page/userguide/cmd_run.html>`__
diff --git a/examples b/examples
index 11947db3..fa891378 160000
--- a/examples
+++ b/examples
@@ -1 +1 @@
-Subproject commit 11947db3ebb17c828c5ea37ca6e3d80f57cf2c57
+Subproject commit fa891378955708aec4d6a0c24bfa5ed9bb0a0dc4