diff --git a/docs/userguide/cmd_init.rst b/docs/userguide/cmd_init.rst
index 713ff39c..69702b05 100644
--- a/docs/userguide/cmd_init.rst
+++ b/docs/userguide/cmd_init.rst
@@ -27,7 +27,7 @@ Usage
 Description
 -----------
 
-Initialize new PlatformIO based project.
+Initialize new PlatformIO based project or update existing with new data.
 
 
 This command will create:
@@ -36,6 +36,8 @@ This command will create:
 * ``src`` - a source directory. Put your source files here
 * ``lib`` - a directory for the project specific (private) libraries.
   PlatformIO will compile them to static libraries and link to executable file
+* ``.travis.yml`` configuration file (template) for Continuous Integration
+  with :ref:`ci_travis`
 
 .. note::
     The source code of each library should be placed in separate directory.
diff --git a/platformio/commands/init.py b/platformio/commands/init.py
index a8417b49..45fa1fe0 100644
--- a/platformio/commands/init.py
+++ b/platformio/commands/init.py
@@ -228,22 +228,56 @@ def init_ci_conf(project_dir):
 # * User Guide for `platformio ci` command
 #   < http://docs.platformio.org/en/latest/userguide/cmd_ci.html >
 #
+#
+# Please choice one of the following templates (proposed below) and uncomment
+# it (remove "# " before each line) or use own configuration according to the
+# Travis CI documentation (see above).
+#
 
-language: python
-python:
-    - "2.7"
 
-# Cache PlatformIO packages using Travis CI container-based infrastructure
-sudo: false
-cache:
-    directories:
-        - "~/.platformio"
+#
+# Template #1: General project. Test it using existing `platformio.ini`.
+#
 
-install:
-    - pip install -U platformio
+# language: python
+# python:
+#     - "2.7"
+#
+# sudo: false
+# cache:
+#     directories:
+#         - "~/.platformio"
+#
+# install:
+#     - pip install -U platformio
+#
+# script:
+#     - platformio run
 
-script:
-    - platformio run
+
+#
+# Template #2: The project is intended to by used as a library with examples
+#
+
+# language: python
+# python:
+#     - "2.7"
+#
+# sudo: false
+# cache:
+#     directories:
+#         - "~/.platformio"
+#
+# env:
+#     - PLATFORMIO_CI_SRC=path/to/test/file.c
+#     - PLATFORMIO_CI_SRC=examples/file.ino
+#     - PLATFORMIO_CI_SRC=path/to/test/directory
+#
+# install:
+#     - pip install -U platformio
+#
+# script:
+#     - platformio ci --lib="." --board=TYPE_1 --board=TYPE_2 --board=TYPE_N
 """)
 
 
diff --git a/platformio/maintenance.py b/platformio/maintenance.py
index dc5a2861..5d5d9496 100644
--- a/platformio/maintenance.py
+++ b/platformio/maintenance.py
@@ -141,8 +141,8 @@ def after_upgrade(ctx):
         (click.style("follow", fg="cyan"),
          click.style("https://twitter.com/PlatformIO_Org", fg="cyan"))
     )
-    click.echo("- %s us a star on GitHub > %s" % (
-        click.style("give", fg="cyan"),
+    click.echo("- %s it on GitHub! > %s" % (
+        click.style("star", fg="cyan"),
         click.style("https://github.com/platformio/platformio", fg="cyan")
     ))
     click.echo("*" * terminal_width)