diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
index 3d714cae..a3eb1d10 100644
--- a/.github/ISSUE_TEMPLATE.md
+++ b/.github/ISSUE_TEMPLATE.md
@@ -2,22 +2,24 @@ What kind of issue is this?
 
 - [ ] Question. This issue tracker is not the place for questions. If you want to ask how to do
       something, or to understand why something isn't working the way you expect it to, use
-      our technical chat https://gitter.im/platformio/platformio
-       
+      our Community Forums http://community.platformio.org
+
 - [ ] Feature Request. Start by telling us what problem you’re trying to solve. Often a solution
       already exists! Don’t send pull requests to implement new features without first getting our
-      support. Sometimes we leave features out on purpose to keep the project small.  
-      
+      support. Sometimes we leave features out on purpose to keep the project small.
+
 - [ ] PlatformIO IDE. All issues related to PlatformIO IDE should be reported to appropriate repository
       https://github.com/platformio/platformio-atom-ide/issues
 
 - [ ] Bug report. If you’ve found a bug, please provide information below.
 
+*You can erase any parts of this template not applicable to your Issue.*
+
 ------------------------------------------------------------------
 
 ### Configuration
 
-**Operating system**: 
+**Operating system**:
 
 **PlatformIO Version** (`platformio --version`):
 
diff --git a/.travis.yml b/.travis.yml
index d0f829cd..c354166f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -16,6 +16,6 @@ script:
 
 notifications:
   slack:
-    on_success: change
-    on_failure: always
     secure: uEU56hHACLxq6iRRZ0JeAl/MPADqQWMZZAsZB9IOnXaRUd0Pa6lT2CicJXhVlsEEbNRqR2u5LbcQ4R0nvAKPjYgglDlDet4RfhP+YIqLX2v2dv3B5q8cITsKMUUediv4fybdO/nmvQSImq5nqRQQsXKAwTAJZooIwS3F5Dsg+eE=
+    on_failure: :always
+    on_success: :change
diff --git a/HISTORY.rst b/HISTORY.rst
index 5b57d8ce..615f72c1 100644
--- a/HISTORY.rst
+++ b/HISTORY.rst
@@ -4,6 +4,32 @@ Release Notes
 PlatformIO 2.0
 --------------
 
+2.8.6 (2016-03-22)
+~~~~~~~~~~~~~~~~~~
+
+* Launched `PlatformIO Community Forums <http://community.platformio.org>`_
+  (`issue #530 <https://github.com/platformio/platformio/issues/530>`_)
+* Added support for ARM mbed-enabled board Seed Arch Max (STM32F407VET6)
+  (`issue #572 <https://github.com/platformio/platformio/issues/572>`_)
+* Improved DNS lookup for PlatformIO API
+* Updated Arduino Wiring-based framework to the latest version for
+  Atmel AVR/SAM development platforms
+* Updated "Teensy Loader CLI" and fixed uploading of large .hex files
+  (`issue #568 <https://github.com/platformio/platformio/issues/568>`_)
+* Updated the support for Sanguino Boards
+  (`issue #586 <https://github.com/platformio/platformio/issues/586>`_)
+* Better handling of used boards when re-initialize/update project
+* Improved support for non-Unicode user profiles for Windows OS
+* Disabled progress bar for download operations when prompts are disabled
+* Fixed multiple definition errors for ST STM32 development platform and
+  ARM mbed framework
+  (`issue #571 <https://github.com/platformio/platformio/issues/571>`_)
+* Fixed invalid board parameters (reset method and baudrate) for a few
+  ESP8266 based boards
+* Fixed "KeyError: 'content-length'" in PlatformIO Download Manager
+  (`issue #591 <https://github.com/platformio/platformio/issues/591>`_)
+
+
 2.8.5 (2016-03-07)
 ~~~~~~~~~~~~~~~~~~
 
@@ -544,7 +570,7 @@ PlatformIO 1.0
 1.5.0 (2015-05-15)
 ~~~~~~~~~~~~~~~~~~
 
-* Added support of `Framework mbed <http://platformio.org/#!/frameworks/mbed>`_
+* Added support of `Framework mbed <http://platformio.org/frameworks/mbed>`_
   for Teensy 3.1
   (`issue #183 <https://github.com/platformio/platformio/issues/183>`_)
 * Added GDB as alternative uploader to `ststm32 <http://docs.platformio.org/en/latest/platforms/ststm32.html>`__ platform
@@ -631,7 +657,7 @@ PlatformIO 1.0
 * Created new `Frameworks <http://docs.platformio.org/en/latest/frameworks/index.html>`__
   page in documentation and added to `PlatformIO Web Site <http://platformio.org>`_
   (`issue #115 <https://github.com/platformio/platformio/issues/115>`_)
-* Introduced online `Embedded Boards Explorer <http://platformio.org/#!/boards>`_
+* Introduced online `Embedded Boards Explorer <http://platformio.org/boards>`_
 * Automatically append define ``-DPLATFORMIO=%version%`` to
   builder (`issue #105 <https://github.com/platformio/platformio/issues/105>`_)
 * Renamed ``stm32`` development platform to
diff --git a/README.rst b/README.rst
index ca52aa95..e256a223 100644
--- a/README.rst
+++ b/README.rst
@@ -22,24 +22,25 @@ PlatformIO
 .. image:: https://img.shields.io/pypi/dm/platformio.svg
     :target: https://pypi.python.org/pypi/platformio/
     :alt: PyPi Downloads
-.. image:: https://img.shields.io/chat/on%20gitter.png
+.. image:: https://img.shields.io/community/PlatformIO.png
    :alt: Join the chat at https://gitter.im/platformio/platformio
-   :target: https://gitter.im/platformio/platformio
+   :target: http://community.platformio.org
 .. image:: https://img.shields.io/donate/PlatformIO.png?color=yellow
    :alt: Donate for PlatformIO.Org
-   :target: http://platformio.org/#!/donate
+   :target: http://platformio.org/donate
 
 
-`Home & Demo <http://platformio.org>`_ |
-`PlatformIO IDE <http://platformio.org/#!/platformio-ide>`_ |
+`Home <http://platformio.org>`_ |
+`IDE <http://platformio.org/platformio-ide>`_ |
 `Project Examples <https://github.com/platformio/platformio/tree/develop/examples>`_ |
 `Docs <http://docs.platformio.org>`_ |
 `Twitter <https://twitter.com/PlatformIO_Org>`_ |
 `Facebook <https://www.facebook.com/platformio>`_ |
 `Hackaday <https://hackaday.io/project/7980-platformio>`_ |
 `Bintray <https://bintray.com/platformio>`_ |
-`Donate <http://platformio.org/#!/donate>`_ |
-`Contact Us <http://platformio.org/#!/contact>`_
+`Community <http://community.platformio.org>`_ |
+`Donate <http://platformio.org/donate>`_ |
+`Contact Us <http://platformio.org/contact>`_
 
 .. image:: https://raw.githubusercontent.com/platformio/platformio/develop/docs/_static/platformio-logo.png
     :target: http://platformio.org
@@ -71,12 +72,12 @@ libOpenCM3, etc.*
 .. image:: https://raw.githubusercontent.com/platformio/platformio/develop/docs/_static/platformio-demo-wiring.gif
     :target: http://platformio.org
 
-* `PlatformIO IDE <http://platformio.org/#!/platformio-ide>`_
-* `Get Started <http://platformio.org/#!/get-started>`_
-* `Web 2.0 Library Search <http://platformio.org/#!/lib>`_
-* `Development Platforms <http://platformio.org/#!/platforms>`_
-* `Frameworks <http://platformio.org/#!/frameworks>`_
-* `Embedded Boards Explorer <http://platformio.org/#!/boards>`_
+* `PlatformIO IDE <http://platformio.org/platformio-ide>`_
+* `Get Started <http://platformio.org/get-started>`_
+* `Web 2.0 Library Search <http://platformio.org/lib>`_
+* `Development Platforms <http://platformio.org/platforms>`_
+* `Frameworks <http://platformio.org/frameworks>`_
+* `Embedded Boards Explorer <http://platformio.org/boards>`_
 * `Library Manager <http://docs.platformio.org/en/latest/librarymanager/index.html>`_
 * `User Guide <http://docs.platformio.org/en/latest/userguide/index.html>`_
 * `Continuous Integration <http://docs.platformio.org/en/latest/ci/index.html>`_
@@ -97,7 +98,7 @@ sized computers (`Raspberry Pi <http://www.raspberrypi.org>`_,
 Embedded Development. *Easier Than Ever.*
 -----------------------------------------
 *PlatformIO* is well suited for embedded development and has pre-configured
-settings for most popular `Embedded Boards <http://platformio.org/#!/boards>`_.
+settings for most popular `Embedded Boards <http://platformio.org/boards>`_.
 
 * Colourful `command-line output <https://raw.githubusercontent.com/platformio/platformio/develop/examples/platformio-examples.png>`_
 * `IDE Integration <http://docs.platformio.org/en/latest/ide.html>`_ with
@@ -107,7 +108,7 @@ settings for most popular `Embedded Boards <http://platformio.org/#!/boards>`_.
 * Built-in `Serial Port Monitor <http://docs.platformio.org/en/latest/userguide/cmd_serialports.html#platformio-serialports-monitor>`_ and configurable
   `build -flags/-options <http://docs.platformio.org/en/latest/projectconf.html#build-flags>`_
 * Automatic **firmware uploading**
-* Pre-built tool chains, frameworks for the popular `Hardware Platforms <http://platformio.org/#!/platforms>`_
+* Pre-built tool chains, frameworks for the popular `Hardware Platforms <http://platformio.org/platforms>`_
 
 .. image:: https://raw.githubusercontent.com/platformio/platformio-web/develop/app/images/platformio-embedded-development.png
     :target: http://platformio.org
@@ -119,7 +120,7 @@ The Missing Library Manager. *It's here!*
 platforms which allows you to organize and have up-to-date external libraries.
 
 * Friendly `Command-Line Interface <http://docs.platformio.org/en/latest/librarymanager/index.html>`_
-* Modern `Web 2.0 Library Search <http://platformio.org/#!/lib>`_
+* Modern `Web 2.0 Library Search <http://platformio.org/lib>`_
 * Open Source `Library Registry API <https://github.com/platformio/platformio-api>`_
 * Library Crawler based on `library.json <http://docs.platformio.org/en/latest/librarymanager/config.html>`_
   specification
@@ -159,27 +160,27 @@ more).
 
 It has support for the most popular embedded platforms:
 
-* `Atmel AVR <http://platformio.org/#!/platforms/atmelavr>`_
-* `Atmel SAM <http://platformio.org/#!/platforms/atmelsam>`_
-* `Espressif <http://platformio.org/#!/platforms/espressif>`_
-* `Freescale Kinetis <http://platformio.org/#!/platforms/freescalekinetis>`_
-* `Nordic nRF51 <http://platformio.org/#!/platforms/nordicnrf51>`_
-* `NXP LPC <http://platformio.org/#!/platforms/nxplpc>`_
-* `ST STM32 <http://platformio.org/#!/platforms/ststm32>`_
-* `Silicon Labs EFM32 <http://platformio.org/#!/platforms/siliconlabsefm32>`_
-* `Teensy <http://platformio.org/#!/platforms/teensy>`_
-* `TI MSP430 <http://platformio.org/#!/platforms/timsp430>`_
-* `TI TIVA C <http://platformio.org/#!/platforms/titiva>`_
+* `Atmel AVR <http://platformio.org/platforms/atmelavr>`_
+* `Atmel SAM <http://platformio.org/platforms/atmelsam>`_
+* `Espressif <http://platformio.org/platforms/espressif>`_
+* `Freescale Kinetis <http://platformio.org/platforms/freescalekinetis>`_
+* `Nordic nRF51 <http://platformio.org/platforms/nordicnrf51>`_
+* `NXP LPC <http://platformio.org/platforms/nxplpc>`_
+* `ST STM32 <http://platformio.org/platforms/ststm32>`_
+* `Silicon Labs EFM32 <http://platformio.org/platforms/siliconlabsefm32>`_
+* `Teensy <http://platformio.org/platforms/teensy>`_
+* `TI MSP430 <http://platformio.org/platforms/timsp430>`_
+* `TI TIVA C <http://platformio.org/platforms/titiva>`_
 
 Frameworks:
 
-* `Arduino <http://platformio.org/#!/frameworks/arduino>`_
-* `CMSIS <http://platformio.org/#!/frameworks/cmsis>`_
-* `libOpenCM3 <http://platformio.org/#!/frameworks/libopencm3>`_
-* `Energia <http://platformio.org/#!/frameworks/energia>`_
-* `SPL <http://platformio.org/#!/frameworks/spl>`_
-* `mbed <http://platformio.org/#!/frameworks/mbed>`_
-* `WiringPi <http://platformio.org/#!/frameworks/wiringpi>`_
+* `Arduino <http://platformio.org/frameworks/arduino>`_
+* `CMSIS <http://platformio.org/frameworks/cmsis>`_
+* `libOpenCM3 <http://platformio.org/frameworks/libopencm3>`_
+* `Energia <http://platformio.org/frameworks/energia>`_
+* `SPL <http://platformio.org/frameworks/spl>`_
+* `mbed <http://platformio.org/frameworks/mbed>`_
+* `WiringPi <http://platformio.org/frameworks/wiringpi>`_
 
 For further details, please refer to `What is PlatformIO? <http://docs.platformio.org/en/latest/faq.html#what-is-platformio>`_
 
diff --git a/docs/_static/clang-installer-add-path.png b/docs/_static/clang-installer-add-path.png
new file mode 100644
index 00000000..8d5d9da6
Binary files /dev/null and b/docs/_static/clang-installer-add-path.png differ
diff --git a/docs/_static/extra.css b/docs/_static/extra.css
index 61bc0108..d5db5063 100644
--- a/docs/_static/extra.css
+++ b/docs/_static/extra.css
@@ -47,7 +47,7 @@ nav {
 }
 @media (min-width: 1200px) {
   .container {
-    width: 1170px;
+    width: 1150px;
   }
 }
 .container-fluid {
diff --git a/docs/_static/ide-atom-platformio-menu-item.png b/docs/_static/ide-atom-platformio-menu-item.png
index faa93c61..81bf7846 100644
Binary files a/docs/_static/ide-atom-platformio-menu-item.png and b/docs/_static/ide-atom-platformio-menu-item.png differ
diff --git a/docs/_static/ide-atom-platformio-quick-start-1.png b/docs/_static/ide-atom-platformio-quick-start-1.png
index 751eaf90..4a021ab9 100644
Binary files a/docs/_static/ide-atom-platformio-quick-start-1.png and b/docs/_static/ide-atom-platformio-quick-start-1.png differ
diff --git a/docs/_static/ide-atom-platformio-quick-start-10.png b/docs/_static/ide-atom-platformio-quick-start-10.png
index eb4622da..df1e70a6 100644
Binary files a/docs/_static/ide-atom-platformio-quick-start-10.png and b/docs/_static/ide-atom-platformio-quick-start-10.png differ
diff --git a/docs/_static/ide-atom-platformio-quick-start-11.png b/docs/_static/ide-atom-platformio-quick-start-11.png
index d78b7ffe..42a5bc84 100644
Binary files a/docs/_static/ide-atom-platformio-quick-start-11.png and b/docs/_static/ide-atom-platformio-quick-start-11.png differ
diff --git a/docs/_static/ide-atom-platformio-quick-start-12.png b/docs/_static/ide-atom-platformio-quick-start-12.png
index c4547985..726372ef 100644
Binary files a/docs/_static/ide-atom-platformio-quick-start-12.png and b/docs/_static/ide-atom-platformio-quick-start-12.png differ
diff --git a/docs/_static/ide-atom-platformio-quick-start-13.png b/docs/_static/ide-atom-platformio-quick-start-13.png
index 3b0c3168..8a23df15 100644
Binary files a/docs/_static/ide-atom-platformio-quick-start-13.png and b/docs/_static/ide-atom-platformio-quick-start-13.png differ
diff --git a/docs/_static/ide-atom-platformio-quick-start-14.png b/docs/_static/ide-atom-platformio-quick-start-14.png
index aa115346..902d1f42 100644
Binary files a/docs/_static/ide-atom-platformio-quick-start-14.png and b/docs/_static/ide-atom-platformio-quick-start-14.png differ
diff --git a/docs/_static/ide-atom-platformio-quick-start-2.png b/docs/_static/ide-atom-platformio-quick-start-2.png
index 5b080247..0251bcf9 100644
Binary files a/docs/_static/ide-atom-platformio-quick-start-2.png and b/docs/_static/ide-atom-platformio-quick-start-2.png differ
diff --git a/docs/_static/ide-atom-platformio-quick-start-3.png b/docs/_static/ide-atom-platformio-quick-start-3.png
index 17b36cb9..9a9ceb31 100644
Binary files a/docs/_static/ide-atom-platformio-quick-start-3.png and b/docs/_static/ide-atom-platformio-quick-start-3.png differ
diff --git a/docs/_static/ide-atom-platformio-quick-start-4.png b/docs/_static/ide-atom-platformio-quick-start-4.png
index c335c423..a5a43411 100644
Binary files a/docs/_static/ide-atom-platformio-quick-start-4.png and b/docs/_static/ide-atom-platformio-quick-start-4.png differ
diff --git a/docs/_static/ide-atom-platformio-quick-start-5.png b/docs/_static/ide-atom-platformio-quick-start-5.png
index c553aa01..80d62571 100644
Binary files a/docs/_static/ide-atom-platformio-quick-start-5.png and b/docs/_static/ide-atom-platformio-quick-start-5.png differ
diff --git a/docs/_static/ide-atom-platformio-quick-start-6.png b/docs/_static/ide-atom-platformio-quick-start-6.png
index ac7f78c2..68bfa56a 100644
Binary files a/docs/_static/ide-atom-platformio-quick-start-6.png and b/docs/_static/ide-atom-platformio-quick-start-6.png differ
diff --git a/docs/_static/ide-atom-platformio-quick-start-7.png b/docs/_static/ide-atom-platformio-quick-start-7.png
index 86ac8c36..5305394c 100644
Binary files a/docs/_static/ide-atom-platformio-quick-start-7.png and b/docs/_static/ide-atom-platformio-quick-start-7.png differ
diff --git a/docs/_static/ide-atom-platformio-quick-start-8.png b/docs/_static/ide-atom-platformio-quick-start-8.png
index 0b0c0713..c38ed575 100644
Binary files a/docs/_static/ide-atom-platformio-quick-start-8.png and b/docs/_static/ide-atom-platformio-quick-start-8.png differ
diff --git a/docs/_static/ide-atom-platformio-quick-start-9.png b/docs/_static/ide-atom-platformio-quick-start-9.png
index 3c51f946..82247515 100644
Binary files a/docs/_static/ide-atom-platformio-quick-start-9.png and b/docs/_static/ide-atom-platformio-quick-start-9.png differ
diff --git a/docs/_static/ide-atom-platformio-toolbar.png b/docs/_static/ide-atom-platformio-toolbar.png
index 67e3e5a1..a625a98c 100644
Binary files a/docs/_static/ide-atom-platformio-toolbar.png and b/docs/_static/ide-atom-platformio-toolbar.png differ
diff --git a/docs/_static/ide-sublime-text-deviot.gif b/docs/_static/ide-sublime-text-deviot.gif
new file mode 100644
index 00000000..1006c529
Binary files /dev/null and b/docs/_static/ide-sublime-text-deviot.gif differ
diff --git a/docs/_static/python-installer-add-path.png b/docs/_static/python-installer-add-path.png
new file mode 100644
index 00000000..43388c2c
Binary files /dev/null and b/docs/_static/python-installer-add-path.png differ
diff --git a/docs/_templates/footer.html b/docs/_templates/footer.html
index 24bc2f5d..03da75ef 100644
--- a/docs/_templates/footer.html
+++ b/docs/_templates/footer.html
@@ -5,22 +5,22 @@
 <header id="pionav" class="navbar navbar-inverse navbar-fixed-top">
   <div class="container container-fluid">
     <div class="navbar-header">
-      <a class="navbar-brand" href="http://platformio.org/"></i> PlatformIO</a>
+      <a class="navbar-brand" href="http://platformio.org">PlatformIO</a>
     </div>
 
     <nav role="navigation">
       <div>
         <ul class="nav navbar-nav">
-          <li><a href="http://platformio.org/#!/get-started"><i class="fa fa-rocket fa-lg"></i>Get Started</a></li>
-          <li><a href="http://platformio.org/#!/platformio-ide"><i class="fa fa-cube fa-lg"></i>IDE</a></li>
-          <li><a href="http://platformio.org/#!/platforms"><i class="fa fa-wrench fa-lg"></i>Development</a></li>
-          <li ><a href="http://platformio.org/#!/lib"><i class="fa fa-code fa-lg"></i>Libraries</a></li>
-          <li class="active"><a href="http://docs.platformio.org/"><i class="fa fa-book fa-lg"></i>Docs</a></li>
+          <li><a href="http://platformio.org/get-started"><i class="fa fa-rocket fa-lg"></i>Get Started</a></li>
+          <li><a href="http://platformio.org/platformio-ide"><i class="fa fa-cube fa-lg"></i>IDE</a></li>
+          <li><a href="http://platformio.org/platforms"><i class="fa fa-wrench fa-lg"></i>Development</a></li>
+          <li ><a href="http://platformio.org/lib"><i class="fa fa-code fa-lg"></i>Libraries</a></li>
         </ul>
 
         <ul class="nav navbar-nav navbar-right">
-          <li><a href="http://platformio.org/#!/donate"><i class="fa fa-heart-o fa-lg"></i>Donate</a></li>
-          <li><a href="http://platformio.org/#!/contact"><i class="fa fa-envelope fa-lg"></i>Contact</a></li>
+          <li class="active"><a href="http://docs.platformio.org"><i class="fa fa-book fa-lg"></i>Docs</a></li>
+          <li><a href="http://community.platformio.org"><i class="fa fa-comments-o fa-lg"></i>Community</a></li>
+          <li><a href="http://platformio.org/contact"><i class="fa fa-envelope fa-lg"></i>Contact</a></li>
         </ul>
       </div>
 
diff --git a/docs/articles.rst b/docs/articles.rst
index 5cdd2564..15804c49 100644
--- a/docs/articles.rst
+++ b/docs/articles.rst
@@ -23,6 +23,10 @@ Here are recent articles about PlatformIO:
 2016
 ^^^^
 
+* Mar 12, 2016 - **Peter Marks** - `PlatformIO, the Arduino IDE for programmers <http://blog.marxy.org/2016/03/platformio-arduino-ide-for-programmers.html>`_
+* Mar 12, 2016 - **Richard Arthurs** - `Getting Started With PlatformIO <http://richarthurs.com/2016/03/12/platformio-review-and-first-thoughts/>`_
+* Mar 07, 2016 - **Joran Jessurun** - `Nieuwe wereld met PlatformIO (New world with PlatformIO, Dutch) <http://blog.wisclub.nl/#post178>`_
+* Mar 05, 2016 - **brichacek.net** - `PlatformIO – otevřený ekosystém pro vývoj IoT (PlatformIO – an open source ecosystem for IoT development, Czech) <http://blog.brichacek.net/platformio-otevreny-ekosystem-pro-vyvoj-iot/>`_
 * Mar 04, 2016 - **Ricardo Vega** - `Programa tu Arduino desde Atom (Program your Arduino from Atom, Spanish) <http://ricveal.com/blog/programa-arduino-desde-atom/>`_
 * Feb 28, 2016 - **Alex Bloggt** - `PlatformIO vorgestellt (Introduction to PlatformIO IDE, German) <https://alexbloggt.com/platformio-vorgestellt/>`_
 * Feb 25, 2016 - **NutDIY** - `PlatformIO Blink On Nodemcu Dev Kit V1.0 (Thai) <http://nutdiy.blogspot.com/2016/02/platformio-blink-on-nodemcu-dev-kit-v10.html>`_
diff --git a/docs/ci/circleci.rst b/docs/ci/circleci.rst
index 30fefe3f..ba6d6932 100644
--- a/docs/ci/circleci.rst
+++ b/docs/ci/circleci.rst
@@ -82,7 +82,7 @@ Install dependent library using :ref:`librarymanager`
             # Install the latest stable PlatformIO
             - sudo pip install -U platformio
 
-            # OneWire Library with ID=1 http://platformio.org/#!/lib/show/1/OneWire
+            # OneWire Library with ID=1 http://platformio.org/lib/show/1/OneWire
             - platformio lib install 1
 
     test:
@@ -157,8 +157,8 @@ Examples
             #
             # Libraries from PlatformIO Library Registry:
             #
-            # http://platformio.org/#!/lib/show/416/TinyGPS
-            # http://platformio.org/#!/lib/show/417/SPI4Teensy3
+            # http://platformio.org/lib/show/416/TinyGPS
+            # http://platformio.org/lib/show/417/SPI4Teensy3
             - platformio lib install 416 417
 
     test:
diff --git a/docs/ci/travis.rst b/docs/ci/travis.rst
index 43e1c2c4..b725ae92 100644
--- a/docs/ci/travis.rst
+++ b/docs/ci/travis.rst
@@ -105,7 +105,7 @@ Install dependent library using :ref:`librarymanager`
         #
         # Libraries from PlatformIO Library Registry:
         #
-        # http://platformio.org/#!/lib/show/1/OneWire
+        # http://platformio.org/lib/show/1/OneWire
         platformio lib install 1
 
 Manually download dependent library and include in build process via ``--lib`` option
@@ -188,8 +188,8 @@ Examples
         #
         # Libraries from PlatformIO Library Registry:
         #
-        # http://platformio.org/#!/lib/show/416/TinyGPS
-        # http://platformio.org/#!/lib/show/417/SPI4Teensy3
+        # http://platformio.org/lib/show/416/TinyGPS
+        # http://platformio.org/lib/show/417/SPI4Teensy3
         - platformio lib install 416 417
 
     script:
@@ -247,10 +247,10 @@ Examples
             - "~/.platformio"
 
     env:
-        - PLATFORMIO_CI_SRC=examples/TimeArduinoDue PLATFORMIO_CI_BOARDS_ARGS="--board=due"
+        - PLATFORMIO_CI_SRC=examples/TimeArduinoDue PLATFORMIO_CI_EXTRA_ARGS="--board=due"
         - PLATFORMIO_CI_SRC=examples/TimeGPS
         - PLATFORMIO_CI_SRC=examples/TimeNTP
-        - PLATFORMIO_CI_SRC=examples/TimeTeensy3 PLATFORMIO_CI_BOARDS_ARGS="--board=teensy31"
+        - PLATFORMIO_CI_SRC=examples/TimeTeensy3 PLATFORMIO_CI_EXTRA_ARGS="--board=teensy31"
         # - ...
 
     install:
@@ -260,11 +260,11 @@ Examples
         #
         # Libraries from PlatformIO Library Registry:
         #
-        # http://platformio.org/#!/lib/show/416/TinyGPS
+        # http://platformio.org/lib/show/416/TinyGPS
         - platformio lib install 416 421 422
 
     script:
-        - if [[ $PLATFORMIO_CI_BOARDS_ARGS ]]; then bash -c 'platformio ci --lib="." $PLATFORMIO_CI_BOARDS_ARGS'; else bash -c 'platformio ci --lib="." --board=uno --board=teensy20pp'; fi
+        - platformio ci --lib="." --board=uno --board=teensy20pp $PLATFORMIO_CI_EXTRA_ARGS
 
 * Configuration file: https://github.com/ivankravets/Time/blob/master/.travis.yml
 * Build History: https://travis-ci.org/ivankravets/Time
diff --git a/docs/faq.rst b/docs/faq.rst
index 1c55f724..8b27dcdd 100644
--- a/docs/faq.rst
+++ b/docs/faq.rst
@@ -24,6 +24,10 @@ What is PlatformIO?
 
 Please refer to :ref:`what_is_pio`
 
+What is ``.pioenvs`` directory
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Please refer to :ref:`projectconf_pio_envs_dir`.
 
 Command completion in Terminal
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
diff --git a/docs/frameworks/arduino.rst b/docs/frameworks/arduino.rst
index 270dce86..49e9ee43 100644
--- a/docs/frameworks/arduino.rst
+++ b/docs/frameworks/arduino.rst
@@ -40,7 +40,7 @@ Platforms
       - The Nordic nRF51 Series is a family of highly flexible, multi-protocol, system-on-chip (SoC) devices for ultra-low power wireless applications. nRF51 Series devices support a range of protocol stacks including Bluetooth Smart (previously called Bluetooth low energy), ANT and proprietary 2.4GHz protocols such as Gazell.
 
     * - :ref:`platform_teensy`
-      - Teensy is a complete USB-based microcontroller development system, in a very small footprint, capable of implementing many types of projects. All programming is done via the USB port. No special programmer is needed, only a standard "Mini-B" USB cable and a PC or Macintosh with a USB port.
+      - Teensy is a complete USB-based microcontroller development system, in a very small footprint, capable of implementing many types of projects. All programming is done via the USB port. No special programmer is needed, only a standard USB cable and a PC or Macintosh with a USB port.
 
     * - :ref:`platform_timsp430`
       - MSP430 microcontrollers (MCUs) from Texas Instruments (TI) are 16-bit, RISC-based, mixed-signal processors designed for ultra-low power. These MCUs offer the lowest power consumption and the perfect mix of integrated peripherals for thousands of applications.
@@ -50,7 +50,7 @@ Boards
 
 .. note::
     * You can list pre-configured boards by :ref:`cmd_boards` command or
-      `PlatformIO Boards Explorer <http://platformio.org/#!/boards>`_
+      `PlatformIO Boards Explorer <http://platformio.org/boards>`_
     * For more detailed ``board`` information please scroll tables below by horizontal.
 
 Adafruit
@@ -502,6 +502,33 @@ Doit
       - 4096 Kb
       - 80 Kb
 
+ESPert
+~~~~~~
+
+.. list-table::
+    :header-rows:  1
+
+    * - Type ``board``
+      - Name
+      - Microcontroller
+      - Frequency
+      - Flash
+      - RAM
+
+    * - ``espresso_lite_v1``
+      - `ESPresso Lite 1.0 <http://www.espert.co>`_
+      - ESP8266
+      - 80 MHz
+      - 4096 Kb
+      - 80 Kb
+
+    * - ``espresso_lite_v2``
+      - `ESPresso Lite 2.0 <http://www.espert.co>`_
+      - ESP8266
+      - 80 MHz
+      - 4096 Kb
+      - 80 Kb
+
 ESPino
 ~~~~~~
 
@@ -604,20 +631,6 @@ Espressif
       - 4096 Kb
       - 50 Kb
 
-    * - ``espresso_lite_v1``
-      - `ESPresso Lite 1.0 <http://www.esp8266.com/wiki/doku.php?id=esp8266-module-family>`_
-      - ESP8266
-      - 80 MHz
-      - 4096 Kb
-      - 80 Kb
-
-    * - ``espresso_lite_v2``
-      - `ESPresso Lite 2.0 <http://www.esp8266.com/wiki/doku.php?id=esp8266-module-family>`_
-      - ESP8266
-      - 80 MHz
-      - 4096 Kb
-      - 80 Kb
-
 LightUp
 ~~~~~~~
 
@@ -969,20 +982,13 @@ Sanguino
       - Flash
       - RAM
 
-    * - ``sanguino_atmega12848m``
+    * - ``sanguino_atmega1284_8m``
       - `Sanguino ATmega1284p (8MHz) <https://code.google.com/p/sanguino/>`_
       - ATMEGA1284P
       - 8 MHz
       - 128 Kb
       - 16 Kb
 
-    * - ``sanguino_atmega1284m``
-      - `Sanguino ATmega1284p (20MHz) <https://code.google.com/p/sanguino/>`_
-      - ATMEGA1284P
-      - 20 MHz
-      - 128 Kb
-      - 16 Kb
-
     * - ``sanguino_atmega1284p``
       - `Sanguino ATmega1284p (16MHz) <https://code.google.com/p/sanguino/>`_
       - ATMEGA1284P
@@ -990,13 +996,34 @@ Sanguino
       - 128 Kb
       - 16 Kb
 
+    * - ``sanguino_atmega644``
+      - `Sanguino ATmega644 or ATmega644A (16 MHz) <https://code.google.com/p/sanguino/>`_
+      - ATMEGA644
+      - 16 MHz
+      - 64 Kb
+      - 4 Kb
+
+    * - ``sanguino_atmega644_8m``
+      - `Sanguino ATmega644 or ATmega644A (8 MHz) <https://code.google.com/p/sanguino/>`_
+      - ATMEGA644
+      - 8 MHz
+      - 64 Kb
+      - 4 Kb
+
     * - ``sanguino_atmega644p``
-      - `Sanguino ATmega644P <https://code.google.com/p/sanguino/>`_
+      - `Sanguino ATmega644P or ATmega644PA (16 MHz) <https://code.google.com/p/sanguino/>`_
       - ATMEGA644P
       - 16 MHz
       - 64 Kb
       - 4 Kb
 
+    * - ``sanguino_atmega644p_8m``
+      - `Sanguino ATmega644P or ATmega644PA (8 MHz) <https://code.google.com/p/sanguino/>`_
+      - ATMEGA644P
+      - 8 MHz
+      - 64 Kb
+      - 4 Kb
+
 SparkFun
 ~~~~~~~~
 
diff --git a/docs/frameworks/cmsis.rst b/docs/frameworks/cmsis.rst
index 8c495c17..8a264924 100644
--- a/docs/frameworks/cmsis.rst
+++ b/docs/frameworks/cmsis.rst
@@ -35,7 +35,7 @@ Boards
 
 .. note::
     * You can list pre-configured boards by :ref:`cmd_boards` command or
-      `PlatformIO Boards Explorer <http://platformio.org/#!/boards>`_
+      `PlatformIO Boards Explorer <http://platformio.org/boards>`_
     * For more detailed ``board`` information please scroll tables below by horizontal.
 
 Armstrap
diff --git a/docs/frameworks/energia.rst b/docs/frameworks/energia.rst
index 1ed32ca8..ccdfc121 100644
--- a/docs/frameworks/energia.rst
+++ b/docs/frameworks/energia.rst
@@ -38,7 +38,7 @@ Boards
 
 .. note::
     * You can list pre-configured boards by :ref:`cmd_boards` command or
-      `PlatformIO Boards Explorer <http://platformio.org/#!/boards>`_
+      `PlatformIO Boards Explorer <http://platformio.org/boards>`_
     * For more detailed ``board`` information please scroll tables below by horizontal.
 
 TI
diff --git a/docs/frameworks/libopencm3.rst b/docs/frameworks/libopencm3.rst
index 729c7b30..1f422e82 100644
--- a/docs/frameworks/libopencm3.rst
+++ b/docs/frameworks/libopencm3.rst
@@ -38,7 +38,7 @@ Boards
 
 .. note::
     * You can list pre-configured boards by :ref:`cmd_boards` command or
-      `PlatformIO Boards Explorer <http://platformio.org/#!/boards>`_
+      `PlatformIO Boards Explorer <http://platformio.org/boards>`_
     * For more detailed ``board`` information please scroll tables below by horizontal.
 
 ST
diff --git a/docs/frameworks/mbed.rst b/docs/frameworks/mbed.rst
index fc69243f..eb0a5bfb 100644
--- a/docs/frameworks/mbed.rst
+++ b/docs/frameworks/mbed.rst
@@ -46,14 +46,14 @@ Platforms
       - The STM32 family of 32-bit Flash MCUs based on the ARM Cortex-M processor is designed to offer new degrees of freedom to MCU users. It offers a 32-bit product range that combines very high performance, real-time capabilities, digital signal processing, and low-power, low-voltage operation, while maintaining full integration and ease of development.
 
     * - :ref:`platform_teensy`
-      - Teensy is a complete USB-based microcontroller development system, in a very small footprint, capable of implementing many types of projects. All programming is done via the USB port. No special programmer is needed, only a standard "Mini-B" USB cable and a PC or Macintosh with a USB port.
+      - Teensy is a complete USB-based microcontroller development system, in a very small footprint, capable of implementing many types of projects. All programming is done via the USB port. No special programmer is needed, only a standard USB cable and a PC or Macintosh with a USB port.
 
 Boards
 ------
 
 .. note::
     * You can list pre-configured boards by :ref:`cmd_boards` command or
-      `PlatformIO Boards Explorer <http://platformio.org/#!/boards>`_
+      `PlatformIO Boards Explorer <http://platformio.org/boards>`_
     * For more detailed ``board`` information please scroll tables below by horizontal.
 
 Atmel
@@ -596,6 +596,13 @@ SeeedStudio
       - Flash
       - RAM
 
+    * - ``seeedArchMax``
+      - `SeeedStudio Arch Max <https://developer.mbed.org/platforms/Seeed-Arch-Max/>`_
+      - STM32F407VET6
+      - 168 MHz
+      - 512 Kb
+      - 192 Kb
+
     * - ``seeedTinyBLE``
       - `SeeedStudio Seeed Tiny BLE <http://developer.mbed.org/platforms/Seeed-Tiny-BLE/>`_
       - NRF51822
diff --git a/docs/frameworks/spl.rst b/docs/frameworks/spl.rst
index 72cf9706..03316962 100644
--- a/docs/frameworks/spl.rst
+++ b/docs/frameworks/spl.rst
@@ -35,7 +35,7 @@ Boards
 
 .. note::
     * You can list pre-configured boards by :ref:`cmd_boards` command or
-      `PlatformIO Boards Explorer <http://platformio.org/#!/boards>`_
+      `PlatformIO Boards Explorer <http://platformio.org/boards>`_
     * For more detailed ``board`` information please scroll tables below by horizontal.
 
 Armstrap
diff --git a/docs/frameworks/wiringpi.rst b/docs/frameworks/wiringpi.rst
index 3e7876b3..46f705f3 100644
--- a/docs/frameworks/wiringpi.rst
+++ b/docs/frameworks/wiringpi.rst
@@ -35,7 +35,7 @@ Boards
 
 .. note::
     * You can list pre-configured boards by :ref:`cmd_boards` command or
-      `PlatformIO Boards Explorer <http://platformio.org/#!/boards>`_
+      `PlatformIO Boards Explorer <http://platformio.org/boards>`_
     * For more detailed ``board`` information please scroll tables below by horizontal.
 
 Raspberry Pi
diff --git a/docs/ide/_platformio_ide_extra.rst b/docs/ide/_platformio_ide_extra.rst
index 2dc0bf3e..56769fb3 100644
--- a/docs/ide/_platformio_ide_extra.rst
+++ b/docs/ide/_platformio_ide_extra.rst
@@ -10,7 +10,7 @@
     limitations under the License.
 
 .. note::
-    We are proud to present our official `PlatformIO IDE <http://platformio.org/#!/platformio-ide>`_ -
+    We are proud to present our official `PlatformIO IDE <http://platformio.org/platformio-ide>`_ -
     The next generation integrated development environment for IoT.
 
     * Cross-platform build system without external dependencies to the OS software:
@@ -28,4 +28,4 @@
     * Serial Port Monitor
     * Built-in Terminal with :ref:`PlatformIO CLI <userguide>` tool (``pio``, ``platformio``)
 
-    `Install PlatformIO IDE <http://platformio.org/#!/platformio-ide>`_.
+    `Install PlatformIO IDE <http://platformio.org/platformio-ide>`_.
diff --git a/docs/ide/atom.rst b/docs/ide/atom.rst
index bcc57848..2069a703 100644
--- a/docs/ide/atom.rst
+++ b/docs/ide/atom.rst
@@ -36,6 +36,8 @@ code editor that's modern, approachable, yet hackable to the core; a tool you
 can customize to do anything but also use productively without ever touching a
 config file.
 
+.. image:: ../_static/ide-atom-platformio.png
+    :target: http://docs.platformio.org/en/latest/_images/ide-atom-platformio.png
 
 .. contents::
 
@@ -46,30 +48,22 @@ PlatformIO IDE is the next generation integrated development environment for IoT
 It's built on top of `GitHub's Atom "hackable" text editor <https://atom.io>`_.
 If you have already Atom installed, please install `PlatformIO IDE for Atom package <https://atom.io/packages/platformio-ide>`_.
 
-Automatic Installation
-~~~~~~~~~~~~~~~~~~~~~~
+.. note::
+    You don't need to install PlatformIO CLI seprately to system.
+    PlatformIO CLI is built into PlatformIO IDE and you will be able to use it
+    within PlatformIO IDE Terminal.
 
-Please download PlatformIO IDE for Atom bundle with built-in auto installer
-(be patient and let the installation complete)
-
-- `Download PlatformIO IDE for Windows <https://dl.bintray.com/platformio/ide-bundles/platformio-atom-windows.exe>`_
-- `Download PlatformIO IDE for Mac <https://dl.bintray.com/platformio/ide-bundles/platformio-atom-mac.zip>`_
-- `Download PlatformIO IDE .deb <https://dl.bintray.com/platformio/ide-bundles/platformio-atom-linux-x86_64.deb>`_
-- `Download PlatformIO IDE .rpm <https://dl.bintray.com/platformio/ide-bundles/platformio-atom-linux-x86_64.rpm>`_
-
-Manual Installation
+1. IDE Installation
 ~~~~~~~~~~~~~~~~~~~
 
-1. Download and install the latest Atom text editor
+.. note::
+    If you don't have Atom installed yet, we propose to download
+    `PlatformIO IDE for Atom bundle <http://platformio.org/platformio-ide>`_
+    with built-in auto installer (optional).
 
-    - `Download Atom for Mac <https://atom.io/download/mac>`_
-    - `Download Atom for Windows <https://atom.io/download/windows>`_
-    - `Download Atom .deb <https://atom.io/download/deb>`_
-    - `Download Atom .rpm <https://atom.io/download/rpm>`_
-    - `Other platforms <https://github.com/atom/atom/releases/latest>`_
-
-
-2. Open Atom Package Manager and install `platformio-ide <https://atom.io/packages/platformio-ide>`_ Atom package
+1. Download and install the `latest official Atom text editor <https://atom.io>`_.
+2. Open Atom Package Manager and install `platformio-ide <https://atom.io/packages/platformio-ide>`_
+   Atom package (be patient and let the installation complete)
 
     - **Mac OS X**: ``Menu: Atom > Preferences > Install``
     - **Windows**: ``Menu: File > Settings > Install``
@@ -77,6 +71,43 @@ Manual Installation
 
 .. image:: ../_static/ide-atom-platformio-install.png
 
+2. Python Interpreter
+~~~~~~~~~~~~~~~~~~~~~
+
+PlatformIO IDE is based on PlatformIO CLI which is written in
+`Python <https://www.python.org/downloads/>`_. Python is installed by default
+on the all popular OS except Windows.
+
+**Windows Users**, please `Download the latest Python 2.7.x <https://www.python.org/downloads/>`_
+and install it. **DON'T FORGET** to select ``Add python.exe to Path`` feature
+on the "Customize" stage, otherwise ``python`` command will not be available.
+
+.. image:: ../_static/python-installer-add-path.png
+
+.. _ide_atom_installation_clang:
+
+3. Clang for Intelligent Code Autocompletion
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+PlatformIO IDE uses `clang <http://clang.llvm.org>`_ for the Intelligent Code Autocompletion.
+To check that ``clang`` is available in your system, please open
+Terminal and run ``clang --version``. If ``clang`` is not installed, then install it:
+
+- **Mac OS X**: Install the latest Xcode along with the latest Command Line Tools
+  (they are installed automatically when you run ``clang`` in Terminal for the
+  first time, or manually by running ``xcode-select --install``
+- **Windows**: Download the latest `Clang for Windows <http://llvm.org/releases/download.html>`_.
+  Please select "Add LLVM to the system PATH" option on the installation step.
+
+  .. image:: ../_static/clang-installer-add-path.png
+
+- **Linux**: Using package managers: ``apt-get install clang`` or ``yum install clang``.
+- **Other Systems**: Download the latest `Clang for the other systems <http://llvm.org/releases/download.html>`_.
+
+.. warning::
+    The libraries which are added/installed after initializing process will
+    not be reflected in code linter. You need ``Menu: PlatformIO >
+    Rebuild C/C++ Project Index (Autocomplete, Linter)``.
 
 .. _atom_ide_quickstart:
 
@@ -253,7 +284,6 @@ Each button contains hint (delay mouse on it).
 * ||
 * Terminal
 * Library Manager
-* Serial Ports
 * Serial Monitor
 * ||
 * Settings
@@ -273,22 +303,14 @@ Building / Uploading / Targets
 * ``cmd-alt-v`` / ``ctrl-alt-v`` / ``f8`` toggles the build panel.
 * ``escape`` terminates build / closes the build window.
 
-More details `Atom Build package <https://atom.io/packages/build>`_.
+More options ``Menu: PlatformIO > Settings > Build``.
 
 Intelligent Code Autocompletion
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 PlatformIO IDE uses `clang <http://clang.llvm.org>`_ for the Intelligent Code Autocompletion.
-To check that ``clang`` is available in your system, please open
-Terminal and run ``clang --version``. If ``clang`` is not installed, then install it:
-
-- **Mac OS X**: Install the latest Xcode along with the latest Command Line Tools
-  (they are installed automatically when you run ``clang`` in Terminal for the
-  first time, or manually by running ``xcode-select --install``
-- **Windows**: Download the latest `Clang for Windows <http://llvm.org/releases/download.html>`_.
-  Please select "Add LLVM to the system PATH" option on the installation step.
-- **Linux**: Using package managers: ``apt-get install clang`` or ``yum install clang``.
-- **Other Systems**: Download the latest `Clang for the other systems <http://llvm.org/releases/download.html>`_.
+To install it or check if it is already installed, please follow to step
+:ref:`ide_atom_installation_clang` from Installation guide.
 
 .. warning::
     The libraries which are added/installed after initializing process will
@@ -412,14 +434,10 @@ To force Smart Code Linter to use Arduino files as C++ please
 Articles / Manuals
 ------------------
 
-* Feb 28, 2016 - **Alex Bloggt** - `PlatformIO vorgestellt (Introduction to PlatformIO IDE, German) <https://alexbloggt.com/platformio-vorgestellt/>`_
+* Mar 12, 2016 - **Peter Marks** - `PlatformIO, the Arduino IDE for programmers <http://blog.marxy.org/2016/03/platformio-arduino-ide-for-programmers.html>`_
+* Mar 05, 2016 - **brichacek.net** - `PlatformIO – otevřený ekosystém pro vývoj IoT (PlatformIO – an open source ecosystem for IoT development, Czech) <http://blog.brichacek.net/platformio-otevreny-ekosystem-pro-vyvoj-iot/>`_
 * Mar 04, 2016 - **Ricardo Vega** - `Programa tu Arduino desde Atom (Program your Arduino from Atom, Spanish) <http://ricveal.com/blog/programa-arduino-desde-atom/>`_
+* Feb 28, 2016 - **Alex Bloggt** - `PlatformIO vorgestellt (Introduction to PlatformIO IDE, German) <https://alexbloggt.com/platformio-vorgestellt/>`_
 * Feb 25, 2016 - **NutDIY** - `PlatformIO Blink On Nodemcu Dev Kit V1.0 (Thai) <http://nutdiy.blogspot.com/2016/02/platformio-blink-on-nodemcu-dev-kit-v10.html>`_
 
 See a full list with :ref:`articles`.
-
-Screenshot
-----------
-
-.. image:: ../_static/ide-atom-platformio.png
-    :target: http://docs.platformio.org/en/latest/_images/ide-atom-platformio.png
diff --git a/docs/ide/clion.rst b/docs/ide/clion.rst
index 5f8fcf51..ebdcbd66 100644
--- a/docs/ide/clion.rst
+++ b/docs/ide/clion.rst
@@ -23,12 +23,15 @@ automated refactorings, project manager, integrated version control systems.
 Refer to the `CLion Documentation <https://www.jetbrains.com/clion/documentation/>`_
 page for more detailed information.
 
+.. image:: ../_static/ide-platformio-clion.png
+    :target: http://docs.platformio.org/en/latest/_static/ide-platformio-clion.png
+
 .. contents::
 
 Integration
 -----------
 
-Choose board ``type`` using :ref:`cmd_boards` or `Embedded Boards Explorer <http://platformio.org/#!/boards>`_
+Choose board ``type`` using :ref:`cmd_boards` or `Embedded Boards Explorer <http://platformio.org/boards>`_
 command and generate project via :option:`platformio init --ide` command:
 
 .. code-block:: shell
@@ -85,12 +88,6 @@ Articles / Manuals
 
 See more :ref:`articles`.
 
-Screenshot
-----------
-
-.. image:: ../_static/ide-platformio-clion.png
-    :target: http://docs.platformio.org/en/latest/_static/ide-platformio-clion.png
-
 Examples
 --------
 
diff --git a/docs/ide/eclipse.rst b/docs/ide/eclipse.rst
index f84f39b9..4da704a7 100644
--- a/docs/ide/eclipse.rst
+++ b/docs/ide/eclipse.rst
@@ -27,12 +27,15 @@ registers, and disassembly viewers.
 Refer to the `CDT Documentation <https://eclipse.org/cdt/documentation.php>`_
 page for more detailed information.
 
+.. image:: ../_static/ide-platformio-eclipse.png
+    :target: http://docs.platformio.org/en/latest/_static/ide-platformio-eclipse.png
+
 .. contents::
 
 Integration
 -----------
 
-Choose board ``type`` using :ref:`cmd_boards` or `Embedded Boards Explorer <http://platformio.org/#!/boards>`_
+Choose board ``type`` using :ref:`cmd_boards` or `Embedded Boards Explorer <http://platformio.org/boards>`_
 command and generate project via :option:`platformio init --ide` command:
 
 .. code-block:: shell
@@ -77,14 +80,6 @@ Articles / Manuals
 
 See a full list with :ref:`articles`.
 
-Screenshot
-----------
-
-Cross-platform `Blink Project <http://platformio.org/#!/get-started#blink-project-example>`_.
-
-.. image:: ../_static/ide-platformio-eclipse.png
-    :target: http://docs.platformio.org/en/latest/_static/ide-platformio-eclipse.png
-
 Examples
 --------
 
diff --git a/docs/ide/emacs.rst b/docs/ide/emacs.rst
index 7f420da6..4a153c86 100644
--- a/docs/ide/emacs.rst
+++ b/docs/ide/emacs.rst
@@ -22,6 +22,9 @@ with extensions to support text editing.
 Refer to the `Emacs Documentation <https://www.gnu.org/software/emacs/#Manuals>`_
 page for more detailed information.
 
+.. image:: ../_static/ide-platformio-emacs.png
+    :target: http://docs.platformio.org/en/latest/_static/ide-platformio-emacs.png
+
 .. contents::
 
 Integration
@@ -42,7 +45,7 @@ Code completion can optionally be provided by installing `irony-mode <https://gi
 Project Generator
 ^^^^^^^^^^^^^^^^^
 
-Choose board ``type`` using :ref:`cmd_boards` or `Embedded Boards Explorer <http://platformio.org/#!/boards>`_
+Choose board ``type`` using :ref:`cmd_boards` or `Embedded Boards Explorer <http://platformio.org/boards>`_
 command and generate project via :option:`platformio init --ide` command:
 
 .. code-block:: shell
@@ -63,10 +66,3 @@ There are 6 predefined targets for building.
     The libraries which are added, installed or used in the project
     after generating process wont be reflected in IDE. To fix it you
     need to reinitialize project using :ref:`cmd_init` (repeat it).
-
-
-Screenshot
-----------
-
-.. image:: ../_static/ide-platformio-emacs.png
-    :target: http://docs.platformio.org/en/latest/_static/ide-platformio-emacs.png
diff --git a/docs/ide/netbeans.rst b/docs/ide/netbeans.rst
index 4a0d75b5..6cba0b76 100644
--- a/docs/ide/netbeans.rst
+++ b/docs/ide/netbeans.rst
@@ -21,15 +21,19 @@ also has a range of new tools for HTML5/JavaScript, in particular for Node.js,
 KnockoutJS, and AngularJS; enhancements that further improve its support for
 Maven and Java EE with PrimeFaces; and improvements to PHP and C/C++ support.
 
-Refer to the `C/C++ Application Learning Trail <https://netbeans.org/kb/trails/cnd.html>`_
-for details.
+NetBeans IDE can be downloaded from `here <https://netbeans.org/downloads/>`_.
+Just make sure you download the C/C++ version (or if you already use NetBeans,
+install the C/C++ development plugins).
+
+.. image:: ../_static/ide-platformio-netbeans.png
+    :target: http://docs.platformio.org/en/latest/_images/ide-platformio-netbeans.png
 
 .. contents::
 
 Integration
 -----------
 
-Choose board ``type`` using :ref:`cmd_boards` or `Embedded Boards Explorer <http://platformio.org/#!/boards>`_
+Choose board ``type`` using :ref:`cmd_boards` or `Embedded Boards Explorer <http://platformio.org/boards>`_
 command and generate project via :option:`platformio init --ide` command:
 
 .. code-block:: shell
@@ -58,9 +62,3 @@ Articles / Manuals
 * Feb 22, 2016 - **Grzegorz Hołdys** - `How to Integrate PlatformIO with Netbeans <http://www.instructables.com/id/How-to-Integrate-PlatformIO-With-Netbeans/>`_
 
 See the full list with :ref:`articles`.
-
-Screenshot
------------
-
-.. image:: ../_static/ide-platformio-netbeans.png
-    :target: http://docs.platformio.org/en/latest/_images/ide-platformio-netbeans.png
diff --git a/docs/ide/qtcreator.rst b/docs/ide/qtcreator.rst
index bbcf2001..d0351c4b 100644
--- a/docs/ide/qtcreator.rst
+++ b/docs/ide/qtcreator.rst
@@ -19,6 +19,9 @@ The `Qt Creator <https://github.com/qtproject/qt-creator>`_ is an open source cr
 Refer to the `Qt-creator Manual <http://doc.qt.io/qtcreator/>`_
 page for more detailed information.
 
+.. image:: ../_static/ide-platformio-qtcreator-7.png
+    :target: http://docs.platformio.org/en/latest/_static/ide-platformio-qtcreator-7.png
+
 .. contents::
 
 Integration
@@ -32,7 +35,7 @@ Integration
 Project Generator
 ^^^^^^^^^^^^^^^^^
 
-Choose board ``type`` using :ref:`cmd_boards` or `Embedded Boards Explorer <http://platformio.org/#!/boards>`_
+Choose board ``type`` using :ref:`cmd_boards` or `Embedded Boards Explorer <http://platformio.org/boards>`_
 command and generate project via :option:`platformio init --ide` command:
 
 .. code-block:: shell
@@ -184,12 +187,6 @@ Conclusion
 
 Taking everything into account, we can build project with shortcut ``Ctrl+Shift+B`` or using ``Menu: Build > Build All``.
 
-Screenshot
-----------
-
-.. image:: ../_static/ide-platformio-qtcreator-7.png
-    :target: http://docs.platformio.org/en/latest/_static/ide-platformio-qtcreator-7.png
-
 Examples
 --------
 
diff --git a/docs/ide/sublimetext.rst b/docs/ide/sublimetext.rst
index 23c722a3..0b6f9b28 100644
--- a/docs/ide/sublimetext.rst
+++ b/docs/ide/sublimetext.rst
@@ -19,15 +19,30 @@ The `Sublime Text <http://www.sublimetext.com/>`_ is a cross-platform text and s
 Refer to the `Sublime Text Documentation <http://docs.sublimetext.info/en/latest>`_
 page for more detailed information.
 
+.. image:: ../_static/ide-sublime-text-deviot.gif
+    :target: https://github.com/gepd/Deviot
+
 .. contents::
 
 Integration
 -----------
 
+Deviot Plugin
+^^^^^^^^^^^^^
+
+We are glad to inform you about awesome Sublime Text plugin for IoT development
+named `Deviot <https://github.com/gepd/Deviot>`_. It is based on
+PlatformIO CLI and will automatically install it for you. Please visit `official
+Deviot page <https://github.com/gepd/Deviot>`_ for the further installation
+steps and documentation.
+
+.. image:: ../_static/ide-sublime-text-deviot.gif
+    :target: https://github.com/gepd/Deviot
+
 Project Generator
 ^^^^^^^^^^^^^^^^^
 
-Choose board ``type`` using :ref:`cmd_boards` or `Embedded Boards Explorer <http://platformio.org/#!/boards>`_
+Choose board ``type`` using :ref:`cmd_boards` or `Embedded Boards Explorer <http://platformio.org/boards>`_
 command and generate project via :option:`platformio init --ide` command:
 
 .. code-block:: shell
@@ -171,11 +186,6 @@ Conclusion
 
 Taking everything into account, we can open project directory in Sublime Text using ``Menu: File > Open Folder`` and build it with shortcut ``Ctrl+B`` (Windows/Linux) or ``Cmd+B`` (Mac), clean project with shortcut ``F11`` and upload firmware to target with shortcut ``F12``.
 
-Screenshot
-----------
-
-.. image:: ../_static/ide-sublime-text-platformio-newproject-5.png
-
 Examples
 --------
 
diff --git a/docs/ide/vim.rst b/docs/ide/vim.rst
index dcb22acf..02a09733 100644
--- a/docs/ide/vim.rst
+++ b/docs/ide/vim.rst
@@ -18,6 +18,8 @@ VIM
 editor. Vim is designed for use both from a command-line interface and as a
 standalone application in a graphical user interface.
 
+.. image:: ../_static/ide-platformio-vim.png
+
 .. contents::
 
 Integration
@@ -85,8 +87,3 @@ Articles / Manuals
 * `コマンドラインでArduino開発 : vim + platformio (Arduino development at the command line: VIM + PlatformIO, Japanese) <http://qiita.com/caad1229/items/7b5fb47f034ae6e0baf2>`_
 
 See a full list with :ref:`articles`.
-
-Screenshot
-----------
-
-.. image:: ../_static/ide-platformio-vim.png
diff --git a/docs/ide/visualstudio.rst b/docs/ide/visualstudio.rst
index 2aa47552..84343e36 100644
--- a/docs/ide/visualstudio.rst
+++ b/docs/ide/visualstudio.rst
@@ -19,6 +19,9 @@ The `Microsoft Visual Studio (Free) <http://visualstudio.com/free>`_ is an integ
 Refer to the `Visual Studio Documentation <https://msdn.microsoft.com/library/vstudio>`_
 page for more detailed information.
 
+.. image:: ../_static/ide-vs-platformio-newproject-8.png
+    :target: http://docs.platformio.org/en/latest/_static/ide-vs-platformio-newproject-8.png
+
 .. contents::
 
 Integration
@@ -32,7 +35,7 @@ Integration
 Project Generator
 ^^^^^^^^^^^^^^^^^
 
-Choose board ``type`` using :ref:`cmd_boards` or `Embedded Boards Explorer <http://platformio.org/#!/boards>`_
+Choose board ``type`` using :ref:`cmd_boards` or `Embedded Boards Explorer <http://platformio.org/boards>`_
 command and generate project via :option:`platformio init --ide` command:
 
 .. code-block:: shell
@@ -144,12 +147,6 @@ Conclusion
 
 Taking everything into account, we can build project with shortcut ``Ctrl+Shift+B`` or using ``Menu: Build > Build Solution``.
 
-Screenshot
-----------
-
-.. image:: ../_static/ide-vs-platformio-newproject-8.png
-    :target: http://docs.platformio.org/en/latest/_static/ide-vs-platformio-newproject-8.png
-
 Examples
 --------
 
diff --git a/docs/index.rst b/docs/index.rst
index 78a9b626..d3f8e806 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -36,8 +36,8 @@ Silicon Labs EFM32, ST STM32, TI MSP430 & Tiva, Teensy, Arduino, mbed,
 libOpenCM3, etc.*
 
 * `Website <http://platformio.org>`_
-* `Web 2.0 Library Search <http://platformio.org/#!/lib>`_ |
-  `Embedded Boards Explorer <http://platformio.org/#!/boards>`_
+* `Web 2.0 Library Search <http://platformio.org/lib>`_ |
+  `Embedded Boards Explorer <http://platformio.org/boards>`_
 * `Project Examples <https://github.com/platformio/platformio/tree/develop/examples>`_
 * `Source Code <https://github.com/platformio/platformio>`_ |
   `Issues <https://github.com/platformio/platformio/issues>`_
@@ -45,7 +45,7 @@ libOpenCM3, etc.*
   `Twitter <https://twitter.com/PlatformIO_Org>`_ |
   `Facebook <https://www.facebook.com/platformio>`_ |
   `Hackaday <https://hackaday.io/project/7980-platformio>`_ |
-  `Reddit <http://www.reddit.com/r/platformio/>`_
+  `Forums <http://community.platformio.org>`_
 
 Embedded Development. *Easier Than Ever.*
 -----------------------------------------
@@ -71,7 +71,7 @@ The Missing Library Manager. *It's here!*
 -----------------------------------------
 
 * Friendly Command-Line Interface
-* Modern `Web 2.0 Library Search <http://platformio.org/#!/lib>`_
+* Modern `Web 2.0 Library Search <http://platformio.org/lib>`_
 * Library dependency management
 * Automatic library updating
 * It runs on Windows, Mac OS X, and Linux (+ARM).
diff --git a/docs/installation.rst b/docs/installation.rst
index b1dedf95..a74cca4e 100644
--- a/docs/installation.rst
+++ b/docs/installation.rst
@@ -39,6 +39,8 @@ System requirements
         "Customize" stage, otherwise Python Package Manager ``pip`` command
         will not be available.
 
+        .. image:: _static/python-installer-add-path.png
+
 :Terminal Application:
 
     All commands below should be executed in
@@ -49,6 +51,12 @@ System requirements
 Installation Methods
 --------------------
 
+.. note::
+    You don't need to install PlatformIO CLI if you are going to use
+    :ref:`ide_atom`. PlatformIO CLI is built into PlatformIO IDE and you will be
+    able to use it within PlatformIO IDE Terminal.
+
+
 Please *choose ONE of* the following methods:
 
 .. contents::
@@ -162,6 +170,11 @@ For upgrading ``platformio`` to the latest version:
 Development Version
 ~~~~~~~~~~~~~~~~~~~
 
+.. warning::
+    If you use :ref:`ide_atom`, please enable development version via
+    ``Menu PlatformIO: Settings > PlatformIO IDE > Use development version of
+    PlatformIO``.
+
 Install the latest PlatformIO from the ``develop`` branch:
 
 .. code-block:: bash
diff --git a/docs/librarymanager/creating.rst b/docs/librarymanager/creating.rst
index 31ca2d50..efbfc32f 100644
--- a/docs/librarymanager/creating.rst
+++ b/docs/librarymanager/creating.rst
@@ -152,6 +152,6 @@ to :ref:`install <cmd_lib_install>` it.
 Examples
 --------
 
-* `GitHub + fixed release <http://platformio.org/#!/lib/show/552/ACNoblex>`_
-* `Dependencies by author and framework <http://platformio.org/#!/lib/show/3/PID-AutoTune>`_
+* `GitHub + fixed release <http://platformio.org/lib/show/552/ACNoblex>`_
+* `Dependencies by author and framework <http://platformio.org/lib/show/3/PID-AutoTune>`_
 * `Multiple libraries in the one repository <https://github.com/jrowberg/i2cdevlib/tree/master/Arduino>`_
diff --git a/docs/librarymanager/index.rst b/docs/librarymanager/index.rst
index 704feac2..8a935663 100644
--- a/docs/librarymanager/index.rst
+++ b/docs/librarymanager/index.rst
@@ -18,7 +18,7 @@ Library Manager
 You can search for new libraries via
 
 * :ref:`Command Line interface <cmd_lib_search>`
-* `Web 2.0 Library Search <http://platformio.org/#!/lib>`_
+* `Web 2.0 Library Search <http://platformio.org/lib>`_
 
 You don't need to bother for finding the latest version of library. Due to
 :ref:`cmd_lib_update` command you will have up-to-date external libraries.
diff --git a/docs/platforms/atmelavr.rst b/docs/platforms/atmelavr.rst
index 356582af..b612ee84 100644
--- a/docs/platforms/atmelavr.rst
+++ b/docs/platforms/atmelavr.rst
@@ -44,8 +44,9 @@ Packages
     **Linux Users:** Don't forget to install "udev" rules file
     `99-platformio-udev.rules <https://github.com/platformio/platformio/blob/develop/scripts/99-platformio-udev.rules>`_ (an instruction is located in the file).
 
-    **Windows Users:** Please check that you have correctly installed USB driver
-    from board manufacturer
+
+    **Windows Users:** Please check that you have correctly installed USB
+    driver from board manufacturer
 
 
 
@@ -65,7 +66,7 @@ Boards
 
 .. note::
     * You can list pre-configured boards by :ref:`cmd_boards` command or
-      `PlatformIO Boards Explorer <http://platformio.org/#!/boards>`_
+      `PlatformIO Boards Explorer <http://platformio.org/boards>`_
     * For more detailed ``board`` information please scroll tables below by
       horizontal.
 
@@ -740,20 +741,13 @@ Sanguino
       - Flash
       - RAM
 
-    * - ``sanguino_atmega12848m``
+    * - ``sanguino_atmega1284_8m``
       - `Sanguino ATmega1284p (8MHz) <https://code.google.com/p/sanguino/>`_
       - ATMEGA1284P
       - 8 MHz
       - 128 Kb
       - 16 Kb
 
-    * - ``sanguino_atmega1284m``
-      - `Sanguino ATmega1284p (20MHz) <https://code.google.com/p/sanguino/>`_
-      - ATMEGA1284P
-      - 20 MHz
-      - 128 Kb
-      - 16 Kb
-
     * - ``sanguino_atmega1284p``
       - `Sanguino ATmega1284p (16MHz) <https://code.google.com/p/sanguino/>`_
       - ATMEGA1284P
@@ -761,13 +755,34 @@ Sanguino
       - 128 Kb
       - 16 Kb
 
+    * - ``sanguino_atmega644``
+      - `Sanguino ATmega644 or ATmega644A (16 MHz) <https://code.google.com/p/sanguino/>`_
+      - ATMEGA644
+      - 16 MHz
+      - 64 Kb
+      - 4 Kb
+
+    * - ``sanguino_atmega644_8m``
+      - `Sanguino ATmega644 or ATmega644A (8 MHz) <https://code.google.com/p/sanguino/>`_
+      - ATMEGA644
+      - 8 MHz
+      - 64 Kb
+      - 4 Kb
+
     * - ``sanguino_atmega644p``
-      - `Sanguino ATmega644P <https://code.google.com/p/sanguino/>`_
+      - `Sanguino ATmega644P or ATmega644PA (16 MHz) <https://code.google.com/p/sanguino/>`_
       - ATMEGA644P
       - 16 MHz
       - 64 Kb
       - 4 Kb
 
+    * - ``sanguino_atmega644p_8m``
+      - `Sanguino ATmega644P or ATmega644PA (8 MHz) <https://code.google.com/p/sanguino/>`_
+      - ATMEGA644P
+      - 8 MHz
+      - 64 Kb
+      - 4 Kb
+
 SparkFun
 ~~~~~~~~
 
diff --git a/docs/platforms/atmelsam.rst b/docs/platforms/atmelsam.rst
index 5d71c4d6..e511b00b 100644
--- a/docs/platforms/atmelsam.rst
+++ b/docs/platforms/atmelsam.rst
@@ -50,8 +50,9 @@ Packages
     **Linux Users:** Don't forget to install "udev" rules file
     `99-platformio-udev.rules <https://github.com/platformio/platformio/blob/develop/scripts/99-platformio-udev.rules>`_ (an instruction is located in the file).
 
-    **Windows Users:** Please check that you have correctly installed USB driver
-    from board manufacturer
+
+    **Windows Users:** Please check that you have correctly installed USB
+    driver from board manufacturer
 
 
 
@@ -74,7 +75,7 @@ Boards
 
 .. note::
     * You can list pre-configured boards by :ref:`cmd_boards` command or
-      `PlatformIO Boards Explorer <http://platformio.org/#!/boards>`_
+      `PlatformIO Boards Explorer <http://platformio.org/boards>`_
     * For more detailed ``board`` information please scroll tables below by
       horizontal.
 
diff --git a/docs/platforms/creating_board.rst b/docs/platforms/creating_board.rst
index 32b617a8..60c6e2e5 100644
--- a/docs/platforms/creating_board.rst
+++ b/docs/platforms/creating_board.rst
@@ -17,7 +17,7 @@ Custom Board
 *PlatformIO* has pre-built settings for the most popular embedded boards. This
 list is available:
 
-* `Embedded Boards Explorer <http://platformio.org/#!/boards>`_ (Web)
+* `Embedded Boards Explorer <http://platformio.org/boards>`_ (Web)
 * :ref:`cmd_boards` (CLI command)
 
 Nevertheless, PlatformIO allows to create own board or override existing
diff --git a/docs/platforms/espressif.rst b/docs/platforms/espressif.rst
index 609b2549..f1e31659 100644
--- a/docs/platforms/espressif.rst
+++ b/docs/platforms/espressif.rst
@@ -50,8 +50,9 @@ Packages
     **Linux Users:** Don't forget to install "udev" rules file
     `99-platformio-udev.rules <https://github.com/platformio/platformio/blob/develop/scripts/99-platformio-udev.rules>`_ (an instruction is located in the file).
 
-    **Windows Users:** Please check that you have correctly installed USB driver
-    from board manufacturer
+
+    **Windows Users:** Please check that you have correctly installed USB
+    driver from board manufacturer
 
 
 
@@ -71,7 +72,7 @@ Boards
 
 .. note::
     * You can list pre-configured boards by :ref:`cmd_boards` command or
-      `PlatformIO Boards Explorer <http://platformio.org/#!/boards>`_
+      `PlatformIO Boards Explorer <http://platformio.org/boards>`_
     * For more detailed ``board`` information please scroll tables below by
       horizontal.
 
@@ -115,6 +116,33 @@ Doit
       - 4096 Kb
       - 80 Kb
 
+ESPert
+~~~~~~
+
+.. list-table::
+    :header-rows:  1
+
+    * - Type ``board``
+      - Name
+      - Microcontroller
+      - Frequency
+      - Flash
+      - RAM
+
+    * - ``espresso_lite_v1``
+      - `ESPresso Lite 1.0 <http://www.espert.co>`_
+      - ESP8266
+      - 80 MHz
+      - 4096 Kb
+      - 80 Kb
+
+    * - ``espresso_lite_v2``
+      - `ESPresso Lite 2.0 <http://www.espert.co>`_
+      - ESP8266
+      - 80 MHz
+      - 4096 Kb
+      - 80 Kb
+
 ESPino
 ~~~~~~
 
@@ -183,20 +211,6 @@ Espressif
       - 4096 Kb
       - 50 Kb
 
-    * - ``espresso_lite_v1``
-      - `ESPresso Lite 1.0 <http://www.esp8266.com/wiki/doku.php?id=esp8266-module-family>`_
-      - ESP8266
-      - 80 MHz
-      - 4096 Kb
-      - 80 Kb
-
-    * - ``espresso_lite_v2``
-      - `ESPresso Lite 2.0 <http://www.esp8266.com/wiki/doku.php?id=esp8266-module-family>`_
-      - ESP8266
-      - 80 MHz
-      - 4096 Kb
-      - 80 Kb
-
 NodeMCU
 ~~~~~~~
 
diff --git a/docs/platforms/espressif_extra.rst b/docs/platforms/espressif_extra.rst
index d16a704d..adaf2af9 100644
--- a/docs/platforms/espressif_extra.rst
+++ b/docs/platforms/espressif_extra.rst
@@ -239,6 +239,7 @@ Using Arduino Framework with Staging version
 Articles
 --------
 
+* Mar 07, 2016 - **Joran Jessurun** - `Nieuwe wereld met PlatformIO (New world with PlatformIO, Dutch) <http://blog.wisclub.nl/#post178>`_
 * Feb 25, 2016 - **NutDIY** - `PlatformIO Blink On Nodemcu Dev Kit V1.0 (ESP 12-E) <http://nutdiy.blogspot.com/2016/02/platformio-blink-on-nodemcu-dev-kit-v10.html>`_
 * Feb 23, 2016 - **Ptarmigan Labs** - `ESP8266 Over The Air updating – what are the options? <https://ptarmiganlabs.com/blog/2016/02/23/esp8266-over-the-air-updating-what-are-the-options/>`_
 * Jan 16, 2016 - **Dani Eichhorn** - `ESP8266 Arduino IDE Alternative: PlatformIO <http://blog.squix.ch/2016/01/esp8266-arduino-ide-alternative.html>`_
diff --git a/docs/platforms/freescalekinetis.rst b/docs/platforms/freescalekinetis.rst
index cab19469..0e26057c 100644
--- a/docs/platforms/freescalekinetis.rst
+++ b/docs/platforms/freescalekinetis.rst
@@ -38,8 +38,9 @@ Packages
     **Linux Users:** Don't forget to install "udev" rules file
     `99-platformio-udev.rules <https://github.com/platformio/platformio/blob/develop/scripts/99-platformio-udev.rules>`_ (an instruction is located in the file).
 
-    **Windows Users:** Please check that you have correctly installed USB driver
-    from board manufacturer
+
+    **Windows Users:** Please check that you have correctly installed USB
+    driver from board manufacturer
 
 
 
@@ -59,7 +60,7 @@ Boards
 
 .. note::
     * You can list pre-configured boards by :ref:`cmd_boards` command or
-      `PlatformIO Boards Explorer <http://platformio.org/#!/boards>`_
+      `PlatformIO Boards Explorer <http://platformio.org/boards>`_
     * For more detailed ``board`` information please scroll tables below by
       horizontal.
 
diff --git a/docs/platforms/linux_arm.rst b/docs/platforms/linux_arm.rst
index 42c072ab..821a60f6 100644
--- a/docs/platforms/linux_arm.rst
+++ b/docs/platforms/linux_arm.rst
@@ -15,7 +15,7 @@ Platform ``linux_arm``
 ======================
 Linux ARM is a Unix-like and mostly POSIX-compliant computer operating system (OS) assembled under the model of free and open-source software development and distribution. Using host OS (Mac OS X, Linux ARM) you can build native application for Linux ARM platform.
 
-For more detailed information please visit `vendor site <http://platformio.org/#!/platforms/linux_arm>`_.
+For more detailed information please visit `vendor site <http://platformio.org/platforms/linux_arm>`_.
 
 .. contents::
 
@@ -50,7 +50,7 @@ Boards
 
 .. note::
     * You can list pre-configured boards by :ref:`cmd_boards` command or
-      `PlatformIO Boards Explorer <http://platformio.org/#!/boards>`_
+      `PlatformIO Boards Explorer <http://platformio.org/boards>`_
     * For more detailed ``board`` information please scroll tables below by
       horizontal.
 
diff --git a/docs/platforms/linux_i686.rst b/docs/platforms/linux_i686.rst
index 5afbda65..eab273a7 100644
--- a/docs/platforms/linux_i686.rst
+++ b/docs/platforms/linux_i686.rst
@@ -15,7 +15,7 @@ Platform ``linux_i686``
 =======================
 Linux i686 (32-bit) is a Unix-like and mostly POSIX-compliant computer operating system (OS) assembled under the model of free and open-source software development and distribution. Using host OS (Mac OS X or Linux 32-bit) you can build native application for Linux i686 platform.
 
-For more detailed information please visit `vendor site <http://platformio.org/#!/platforms/linux_i686>`_.
+For more detailed information please visit `vendor site <http://platformio.org/platforms/linux_i686>`_.
 
 .. contents::
 
diff --git a/docs/platforms/linux_x86_64.rst b/docs/platforms/linux_x86_64.rst
index a3353056..c368a17d 100644
--- a/docs/platforms/linux_x86_64.rst
+++ b/docs/platforms/linux_x86_64.rst
@@ -15,7 +15,7 @@ Platform ``linux_x86_64``
 =========================
 Linux x86_64 (64-bit) is a Unix-like and mostly POSIX-compliant computer operating system (OS) assembled under the model of free and open-source software development and distribution. Using host OS (Mac OS X or Linux 64-bit) you can build native application for Linux x86_64 platform.
 
-For more detailed information please visit `vendor site <http://platformio.org/#!/platforms/linux_i686>`_.
+For more detailed information please visit `vendor site <http://platformio.org/platforms/linux_i686>`_.
 
 .. contents::
 
diff --git a/docs/platforms/native.rst b/docs/platforms/native.rst
index 4b501f1f..74d1afd5 100644
--- a/docs/platforms/native.rst
+++ b/docs/platforms/native.rst
@@ -15,6 +15,6 @@ Platform ``native``
 ===================
 Native development platform is intended to be used for desktop OS. This platform uses built-in toolchains (preferable based on GCC), frameworks, libs from particular OS where it will be run.
 
-For more detailed information please visit `vendor site <http://platformio.org/#!/platforms/native>`_.
+For more detailed information please visit `vendor site <http://platformio.org/platforms/native>`_.
 
 .. contents::
\ No newline at end of file
diff --git a/docs/platforms/nordicnrf51.rst b/docs/platforms/nordicnrf51.rst
index 9d51cb4c..8054ac9a 100644
--- a/docs/platforms/nordicnrf51.rst
+++ b/docs/platforms/nordicnrf51.rst
@@ -44,8 +44,9 @@ Packages
     **Linux Users:** Don't forget to install "udev" rules file
     `99-platformio-udev.rules <https://github.com/platformio/platformio/blob/develop/scripts/99-platformio-udev.rules>`_ (an instruction is located in the file).
 
-    **Windows Users:** Please check that you have correctly installed USB driver
-    from board manufacturer
+
+    **Windows Users:** Please check that you have correctly installed USB
+    driver from board manufacturer
 
 
 
@@ -68,7 +69,7 @@ Boards
 
 .. note::
     * You can list pre-configured boards by :ref:`cmd_boards` command or
-      `PlatformIO Boards Explorer <http://platformio.org/#!/boards>`_
+      `PlatformIO Boards Explorer <http://platformio.org/boards>`_
     * For more detailed ``board`` information please scroll tables below by
       horizontal.
 
diff --git a/docs/platforms/nxplpc.rst b/docs/platforms/nxplpc.rst
index 9eeeb669..129213df 100644
--- a/docs/platforms/nxplpc.rst
+++ b/docs/platforms/nxplpc.rst
@@ -38,8 +38,9 @@ Packages
     **Linux Users:** Don't forget to install "udev" rules file
     `99-platformio-udev.rules <https://github.com/platformio/platformio/blob/develop/scripts/99-platformio-udev.rules>`_ (an instruction is located in the file).
 
-    **Windows Users:** Please check that you have correctly installed USB driver
-    from board manufacturer
+
+    **Windows Users:** Please check that you have correctly installed USB
+    driver from board manufacturer
 
 
 
@@ -59,7 +60,7 @@ Boards
 
 .. note::
     * You can list pre-configured boards by :ref:`cmd_boards` command or
-      `PlatformIO Boards Explorer <http://platformio.org/#!/boards>`_
+      `PlatformIO Boards Explorer <http://platformio.org/boards>`_
     * For more detailed ``board`` information please scroll tables below by
       horizontal.
 
diff --git a/docs/platforms/siliconlabsefm32.rst b/docs/platforms/siliconlabsefm32.rst
index 4095ef5a..11929989 100644
--- a/docs/platforms/siliconlabsefm32.rst
+++ b/docs/platforms/siliconlabsefm32.rst
@@ -38,8 +38,9 @@ Packages
     **Linux Users:** Don't forget to install "udev" rules file
     `99-platformio-udev.rules <https://github.com/platformio/platformio/blob/develop/scripts/99-platformio-udev.rules>`_ (an instruction is located in the file).
 
-    **Windows Users:** Please check that you have correctly installed USB driver
-    from board manufacturer
+
+    **Windows Users:** Please check that you have correctly installed USB
+    driver from board manufacturer
 
 
 
@@ -59,7 +60,7 @@ Boards
 
 .. note::
     * You can list pre-configured boards by :ref:`cmd_boards` command or
-      `PlatformIO Boards Explorer <http://platformio.org/#!/boards>`_
+      `PlatformIO Boards Explorer <http://platformio.org/boards>`_
     * For more detailed ``board`` information please scroll tables below by
       horizontal.
 
diff --git a/docs/platforms/ststm32.rst b/docs/platforms/ststm32.rst
index 62e0dc85..040af032 100644
--- a/docs/platforms/ststm32.rst
+++ b/docs/platforms/ststm32.rst
@@ -53,8 +53,9 @@ Packages
     **Linux Users:** Don't forget to install "udev" rules file
     `99-platformio-udev.rules <https://github.com/platformio/platformio/blob/develop/scripts/99-platformio-udev.rules>`_ (an instruction is located in the file).
 
-    **Windows Users:** Please check that you have correctly installed USB driver
-    from board manufacturer
+
+    **Windows Users:** Please check that you have correctly installed USB
+    driver from board manufacturer
 
 
 
@@ -83,7 +84,7 @@ Boards
 
 .. note::
     * You can list pre-configured boards by :ref:`cmd_boards` command or
-      `PlatformIO Boards Explorer <http://platformio.org/#!/boards>`_
+      `PlatformIO Boards Explorer <http://platformio.org/boards>`_
     * For more detailed ``board`` information please scroll tables below by
       horizontal.
 
@@ -330,4 +331,24 @@ ST
       - 1024 Kb
       - 128 Kb
 
+SeeedStudio
+~~~~~~~~~~~
+
+.. list-table::
+    :header-rows:  1
+
+    * - Type ``board``
+      - Name
+      - Microcontroller
+      - Frequency
+      - Flash
+      - RAM
+
+    * - ``seeedArchMax``
+      - `SeeedStudio Arch Max <https://developer.mbed.org/platforms/Seeed-Arch-Max/>`_
+      - STM32F407VET6
+      - 168 MHz
+      - 512 Kb
+      - 192 Kb
+
 .. include:: ststm32_extra.rst
diff --git a/docs/platforms/teensy.rst b/docs/platforms/teensy.rst
index c8a74616..487e8920 100644
--- a/docs/platforms/teensy.rst
+++ b/docs/platforms/teensy.rst
@@ -13,7 +13,7 @@
 
 Platform ``teensy``
 ===================
-Teensy is a complete USB-based microcontroller development system, in a very small footprint, capable of implementing many types of projects. All programming is done via the USB port. No special programmer is needed, only a standard "Mini-B" USB cable and a PC or Macintosh with a USB port.
+Teensy is a complete USB-based microcontroller development system, in a very small footprint, capable of implementing many types of projects. All programming is done via the USB port. No special programmer is needed, only a standard USB cable and a PC or Macintosh with a USB port.
 
 For more detailed information please visit `vendor site <https://www.pjrc.com/teensy>`_.
 
@@ -50,9 +50,13 @@ Packages
     **Linux Users:** Don't forget to install "udev" rules file
     `99-platformio-udev.rules <https://github.com/platformio/platformio/blob/develop/scripts/99-platformio-udev.rules>`_ (an instruction is located in the file).
 
-    **Windows Users:** Please check that you have correctly installed USB driver
-    from board manufacturer
 
+    **Windows Users:** Teensy programming uses only Windows built-in HID
+    drivers. When Teensy is programmed to act as a USB Serial device,
+    Windows XP, Vista, 7 and 8 require `this serial driver
+    <http://www.pjrc.com/teensy/serial_install.exe>`_
+    is needed to access the COM port your program uses. No special driver
+    installation is necessary on Windows 10.
 
 
 Frameworks
@@ -74,7 +78,7 @@ Boards
 
 .. note::
     * You can list pre-configured boards by :ref:`cmd_boards` command or
-      `PlatformIO Boards Explorer <http://platformio.org/#!/boards>`_
+      `PlatformIO Boards Explorer <http://platformio.org/boards>`_
     * For more detailed ``board`` information please scroll tables below by
       horizontal.
 
@@ -125,3 +129,5 @@ Teensy
       - 48 MHz
       - 64 Kb
       - 8 Kb
+
+.. include:: teensy_extra.rst
diff --git a/docs/platforms/teensy_extra.rst b/docs/platforms/teensy_extra.rst
new file mode 100644
index 00000000..a5767f67
--- /dev/null
+++ b/docs/platforms/teensy_extra.rst
@@ -0,0 +1,20 @@
+..  Copyright 2014-2016 Ivan Kravets <me@ikravets.com>
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+       http://www.apache.org/licenses/LICENSE-2.0
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+Examples
+--------
+
+All project examples are located in PlatformIO repository
+`Examples for Teensy platform <https://github.com/platformio/platformio/tree/develop/examples/teensy>`_.
+
+* `Wiring Blink <https://github.com/platformio/platformio/tree/develop/examples/wiring-blink>`_
+* `HID Mouse <https://github.com/platformio/platformio/tree/develop/examples/teensy/teensy-hid-usb-mouse>`_
+* `Chat Server <https://github.com/platformio/platformio/tree/develop/examples/teensy/teensy-internal-libs>`_
diff --git a/docs/platforms/timsp430.rst b/docs/platforms/timsp430.rst
index 39aea248..25972285 100644
--- a/docs/platforms/timsp430.rst
+++ b/docs/platforms/timsp430.rst
@@ -44,8 +44,9 @@ Packages
     **Linux Users:** Don't forget to install "udev" rules file
     `99-platformio-udev.rules <https://github.com/platformio/platformio/blob/develop/scripts/99-platformio-udev.rules>`_ (an instruction is located in the file).
 
-    **Windows Users:** Please check that you have correctly installed USB driver
-    from board manufacturer
+
+    **Windows Users:** Please check that you have correctly installed USB
+    driver from board manufacturer
 
 
 
@@ -68,7 +69,7 @@ Boards
 
 .. note::
     * You can list pre-configured boards by :ref:`cmd_boards` command or
-      `PlatformIO Boards Explorer <http://platformio.org/#!/boards>`_
+      `PlatformIO Boards Explorer <http://platformio.org/boards>`_
     * For more detailed ``board`` information please scroll tables below by
       horizontal.
 
diff --git a/docs/platforms/timsp430_extra.rst b/docs/platforms/timsp430_extra.rst
index 364ac8d0..c94f0f6f 100644
--- a/docs/platforms/timsp430_extra.rst
+++ b/docs/platforms/timsp430_extra.rst
@@ -22,7 +22,7 @@ Examples
 All project examples are located in PlatformIO repository
 `Examples for TI MSP430 platform <https://github.com/platformio/platformio/tree/develop/examples/timsp430>`_.
 
-* `PanStamp blink <https://github.com/platformio/platformio/tree/develop/examples/timsp430/panstamp-blink>`_
 * `Energia blink <https://github.com/platformio/platformio/tree/develop/examples/timsp430/timsp430-energia-blink>`_
 * `Native blink <https://github.com/platformio/platformio/tree/develop/examples/timsp430/timsp430-native-blink>`_
 * `Wiring Blink <https://github.com/platformio/platformio/tree/develop/examples/wiring-blink>`_
+* `PanStamp blink <https://github.com/platformio/platformio/tree/develop/examples/timsp430/panstamp-blink>`_
diff --git a/docs/platforms/titiva.rst b/docs/platforms/titiva.rst
index 8effb509..eefbdbed 100644
--- a/docs/platforms/titiva.rst
+++ b/docs/platforms/titiva.rst
@@ -47,8 +47,9 @@ Packages
     **Linux Users:** Don't forget to install "udev" rules file
     `99-platformio-udev.rules <https://github.com/platformio/platformio/blob/develop/scripts/99-platformio-udev.rules>`_ (an instruction is located in the file).
 
-    **Windows Users:** Please check that you have correctly installed USB driver
-    from board manufacturer
+
+    **Windows Users:** Please check that you have correctly installed USB
+    driver from board manufacturer
 
 
 
@@ -71,7 +72,7 @@ Boards
 
 .. note::
     * You can list pre-configured boards by :ref:`cmd_boards` command or
-      `PlatformIO Boards Explorer <http://platformio.org/#!/boards>`_
+      `PlatformIO Boards Explorer <http://platformio.org/boards>`_
     * For more detailed ``board`` information please scroll tables below by
       horizontal.
 
@@ -108,3 +109,5 @@ TI
       - 120 MHz
       - 1024 Kb
       - 256 Kb
+
+.. include:: titiva_extra.rst
diff --git a/docs/platforms/titiva_extra.rst b/docs/platforms/titiva_extra.rst
new file mode 100644
index 00000000..89aa3e87
--- /dev/null
+++ b/docs/platforms/titiva_extra.rst
@@ -0,0 +1,27 @@
+..  Copyright 2014-2016 Ivan Kravets <me@ikravets.com>
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+       http://www.apache.org/licenses/LICENSE-2.0
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+Articles
+--------
+
+* Mar 12, 2016 - **Richard Arthurs** - `Getting Started With PlatformIO <http://richarthurs.com/2016/03/12/platformio-review-and-first-thoughts/>`_
+
+See more :ref:`articles`.
+
+Examples
+--------
+
+All project examples are located in PlatformIO repository
+`Examples for TI TIVA platform <https://github.com/platformio/platformio/tree/develop/examples/titiva>`_.
+
+* `Energia blink <https://github.com/platformio/platformio/tree/develop/examples/titiva/titiva-energia-blink>`_
+* `Native blink <https://github.com/platformio/platformio/tree/develop/examples/titiva/titiva-native-blink>`_
+* `OpenCM3 Blink <https://github.com/platformio/platformio/tree/develop/examples/titiva/titiva-opencm3-blink>`_
diff --git a/docs/platforms/windows_x86.rst b/docs/platforms/windows_x86.rst
index 8f2c2ff6..3836a807 100644
--- a/docs/platforms/windows_x86.rst
+++ b/docs/platforms/windows_x86.rst
@@ -15,7 +15,7 @@ Platform ``windows_x86``
 ========================
 Windows x86 (32-bit) is a metafamily of graphical operating systems developed and marketed by Microsoft. Using host OS (Windows, Linux 32/64 or Mac OS X) you can build native application for Windows x86 platform.
 
-For more detailed information please visit `vendor site <http://platformio.org/#!/platforms/windows_x86>`_.
+For more detailed information please visit `vendor site <http://platformio.org/platforms/windows_x86>`_.
 
 .. contents::
 
diff --git a/docs/projectconf.rst b/docs/projectconf.rst
index 2f1c368a..b38954ec 100644
--- a/docs/projectconf.rst
+++ b/docs/projectconf.rst
@@ -97,7 +97,7 @@ This option can be overridden by global environment variable
 ``envs_dir``
 ^^^^^^^^^^^^
 
-*PlatformIO Builder* within :ref:`cmd_run` command uses this folder for project
+This is a cache directory. *PlatformIO Build System* uses this folder for project
 environments to store compiled object files, static libraries, firmwares and
 other cached information. It allows PlatformIO to build source code extremely
 fast!
@@ -178,7 +178,7 @@ need to specify ``board_mcu``, ``board_f_cpu``, ``upload_protocol`` or
 pre-fill options described above with appropriate values.
 
 You can find the ``board`` type in *Boards* section of each :ref:`platforms` or
-using `PlatformIO Embedded Boards Explorer <http://platformio.org/#!/boards>`_.
+using `PlatformIO Embedded Boards Explorer <http://platformio.org/boards>`_.
 
 
 Board options
diff --git a/docs/quickstart.rst b/docs/quickstart.rst
index 08490e18..f70bbe63 100644
--- a/docs/quickstart.rst
+++ b/docs/quickstart.rst
@@ -60,7 +60,7 @@ Board Identifier
 ----------------
 
 :ref:`cmd_init` command requires to specify board identifier (ID/TYPE). It can
-be found using `Embedded Boards Explorer <http://platformio.org/#!/boards>`_
+be found using `Embedded Boards Explorer <http://platformio.org/boards>`_
 or :ref:`cmd_boards` command. For example, using :ref:`cmd_boards` let's try
 to find Teensy boards:
 
diff --git a/docs/userguide/cmd_serialports.rst b/docs/userguide/cmd_serialports.rst
index 232ed883..0ba8f36a 100644
--- a/docs/userguide/cmd_serialports.rst
+++ b/docs/userguide/cmd_serialports.rst
@@ -95,7 +95,7 @@ Description
 ~~~~~~~~~~~
 
 This is a console application that provides a small terminal
-application. It is based on `Miniterm <http://pyserial.sourceforge.net/examples.html#miniterm>`_
+application. It is based on `Miniterm <https://pythonhosted.org/pyserial/examples.html#miniterm>`_
 and itself does not implement any terminal features such
 as *VT102* compatibility. However it inherits these features from the terminal
 it is run. For example on GNU/Linux running from an *xterm* it will support the
diff --git a/docs/userguide/lib/cmd_install.rst b/docs/userguide/lib/cmd_install.rst
index dbeaed73..a28c24a6 100644
--- a/docs/userguide/lib/cmd_install.rst
+++ b/docs/userguide/lib/cmd_install.rst
@@ -28,7 +28,7 @@ Description
 -----------
 
 Install new library  by specified
-`PlatformIO Library Registry ID <http://platformio.org/#!/lib>`_.
+`PlatformIO Library Registry ID <http://platformio.org/lib>`_.
 
 Options
 -------
@@ -48,7 +48,7 @@ Examples
 
 .. code-block:: bash
 
-    # IRremote: http://platformio.org/#!/lib/show/4/IRremote
+    # IRremote: http://platformio.org/lib/show/4/IRremote
     $ platformio lib install 4
     # Installing library [ 4 ]:
     # Downloading  [####################################]  100%
@@ -60,7 +60,7 @@ Examples
 
 .. code-block:: bash
 
-    # XBee: http://platformio.org/#!/lib/show/6/XBee
+    # XBee: http://platformio.org/lib/show/6/XBee
     $ platformio lib install 6 --version=0.5
     # Installing library [ 6 ]:
     # Downloading  [####################################]  100%
@@ -72,7 +72,7 @@ Examples
 
 .. code-block:: bash
 
-    # Adafruit-ST7735: http://platformio.org/#!/lib/show/12/Adafruit-ST7735
+    # Adafruit-ST7735: http://platformio.org/lib/show/12/Adafruit-ST7735
     $ platformio lib install 12
     # Installing library [ 12 ]:
     # Downloading  [####################################]  100%
diff --git a/docs/userguide/lib/cmd_search.rst b/docs/userguide/lib/cmd_search.rst
index 51f12248..9ad9d66f 100644
--- a/docs/userguide/lib/cmd_search.rst
+++ b/docs/userguide/lib/cmd_search.rst
@@ -27,7 +27,7 @@ Usage
 Description
 -----------
 
-Search for library in `PlatformIO Library Registry <http://platformio.org/#!/lib>`_
+Search for library in `PlatformIO Library Registry <http://platformio.org/lib>`_
 by :ref:`library_config` fields in the boolean mode.
 
 The boolean search capability supports the following operators:
@@ -121,7 +121,7 @@ Examples
     # Show next libraries? [y/N]:
     # ...
 
-2. Search for `1-Wire libraries <http://platformio.org/#!/lib/search?query=%25221-wire%2522>`_
+2. Search for `1-Wire libraries <http://platformio.org/lib/search?query=%25221-wire%2522>`_
 
 .. code-block:: bash
 
@@ -133,7 +133,7 @@ Examples
     # [  1  ] OneWire          arduino, atmelavr     "Paul Stoffregen": Control devices (from Dallas Semiconductor) that use the One Wire protocol (DS18S20, DS18B20, DS2408 and etc)
     # ...
 
-3. Search for `Arduino-based "I2C" libraries <http://platformio.org/#!/lib/search?query=framework%253Aarduino%2520i2c>`_
+3. Search for `Arduino-based "I2C" libraries <http://platformio.org/lib/search?query=framework%253Aarduino%2520i2c>`_
 
 .. code-block:: bash
 
@@ -148,7 +148,7 @@ Examples
     # [ 14  ] Adafruit-9DOF-Unified arduino, atmelavr     "Adafruit Industries": Unified sensor driver for the Adafruit 9DOF Breakout (L3GD20 / LSM303)
     # ...
 
-4. Search for `libraries by "web" and "http" keywords <http://platformio.org/#!/lib/search?query=keyword%253A%2522web%2522%2520keyword%253A%2522http%2522>`_.
+4. Search for `libraries by "web" and "http" keywords <http://platformio.org/lib/search?query=keyword%253A%2522web%2522%2520keyword%253A%2522http%2522>`_.
 
 .. code-block:: bash
 
@@ -161,7 +161,7 @@ Examples
     # [ 17  ] Adafruit-CC3000  arduino, atmelavr     "Adafruit Industries": Library code for Adafruit's CC3000 Wi-Fi/WiFi breakouts
     # ...
 
-5. Search for `libraries by "Adafruit Industries" author <http://platformio.org/#!/lib/search?query=author%253A%2522Adafruit%20Industries%2522>`_
+5. Search for `libraries by "Adafruit Industries" author <http://platformio.org/lib/search?query=author%253A%2522Adafruit%20Industries%2522>`_
 
 .. code-block:: bash
 
@@ -176,7 +176,7 @@ Examples
     # [ 26  ] Adafruit-LSM303DLHC-Unified arduino, atmelavr     "Adafruit Industries": Unified sensor driver for Adafruit's LSM303 Breakout (Accelerometer + Magnetometer)
     # ...
 
-6. Search for `libraries which are compatible with Dallas temperature sensors <http://platformio.org/#!/lib/search?query=DS*>`_
+6. Search for `libraries which are compatible with Dallas temperature sensors <http://platformio.org/lib/search?query=DS*>`_
    like DS18B20, DS18S20 and etc.
 
 .. code-block:: bash
@@ -189,7 +189,7 @@ Examples
     # [  1  ] OneWire          arduino, atmelavr     "Paul Stoffregen": Control devices (from Dallas Semiconductor) that use the One Wire protocol (DS18S20, DS18B20, DS2408 and etc)
     # ...
 
-7. Search for `Energia-based *nRF24* or *HttpClient* libraries <http://platformio.org/#!/lib/search?query=framework%253Aenergia%2520%252B(nRF24%2520HttpClient)>`_.
+7. Search for `Energia-based *nRF24* or *HttpClient* libraries <http://platformio.org/lib/search?query=framework%253Aenergia%2520%252B(nRF24%2520HttpClient)>`_.
    The search query that is described below can be interpreted like
    ``energia nRF24 OR energia HttpClient``
 
@@ -204,7 +204,7 @@ Examples
     # [ 43  ] nRF24            energia, timsp430     "Eric": The nRF24L01 is a low-cost 2.4GHz ISM transceiver module. It supports a number of channel frequencies in the 2.4GHz band and a range of data rates.
 
 
-8. Search for the `all sensor libraries excluding temperature <http://platformio.org/#!/lib/search?query=sensor%2520-temperature>`_.
+8. Search for the `all sensor libraries excluding temperature <http://platformio.org/lib/search?query=sensor%2520-temperature>`_.
 
 .. code-block:: bash
 
diff --git a/docs/userguide/lib/cmd_show.rst b/docs/userguide/lib/cmd_show.rst
index 0273f3a2..745685d1 100644
--- a/docs/userguide/lib/cmd_show.rst
+++ b/docs/userguide/lib/cmd_show.rst
@@ -35,7 +35,7 @@ Examples
 
 .. code-block:: bash
 
-    # OneWire: http://platformio.org/#!/lib/show/1/OneWire
+    # OneWire: http://platformio.org/lib/show/1/OneWire
     $ platformio lib show 1
     # OneWire
     # -------
diff --git a/docs/userguide/lib/cmd_uninstall.rst b/docs/userguide/lib/cmd_uninstall.rst
index 8e487e36..df99372b 100644
--- a/docs/userguide/lib/cmd_uninstall.rst
+++ b/docs/userguide/lib/cmd_uninstall.rst
@@ -35,6 +35,6 @@ Examples
 
 .. code-block:: bash
 
-    # XBee: http://platformio.org/#!/lib/show/6/XBee
+    # XBee: http://platformio.org/lib/show/6/XBee
     $ platformio lib uninstall 6
     # The library #6 'XBee' has been successfully uninstalled!
diff --git a/docs/what-is-platformio.rst b/docs/what-is-platformio.rst
index 4283546e..0eb61dd5 100644
--- a/docs/what-is-platformio.rst
+++ b/docs/what-is-platformio.rst
@@ -75,10 +75,10 @@ console application, it can be used in combination with one's favorite
 Alright, so PlatformIO can run on different operating systems. But more
 importantly, from development perspective at least, is a list of supported
 boards and MCUs. To keep things short: PlatformIO supports approximately 200
-`Embedded Boards <http://platformio.org/#!/boards>`_ and all major
+`Embedded Boards <http://platformio.org/boards>`_ and all major
 :ref:`Development Platforms <platforms>`.
 
-User SHOULD have a choise
+User SHOULD have a choice
 -------------------------
 
 * Decide which operation system they want to run development process on.
diff --git a/platformio/__init__.py b/platformio/__init__.py
index 710fdf6a..3fb5bef8 100644
--- a/platformio/__init__.py
+++ b/platformio/__init__.py
@@ -14,7 +14,7 @@
 
 import sys
 
-VERSION = (2, 8, 5)
+VERSION = (2, 8, 6)
 __version__ = ".".join([str(s) for s in VERSION])
 
 __title__ = "platformio"
@@ -33,6 +33,7 @@ __license__ = "Apache Software License"
 __copyright__ = "Copyright 2014-2016 Ivan Kravets"
 
 __apiurl__ = "http://api.platformio.org"
+__apiip__ = "178.62.159.183"
 
 
 if sys.version_info >= (3, 0, 0):
diff --git a/platformio/app.py b/platformio/app.py
index 3a6ae6cb..cda86dc4 100644
--- a/platformio/app.py
+++ b/platformio/app.py
@@ -186,4 +186,5 @@ def set_session_var(name, value):
 
 
 def is_disabled_progressbar():
-    return is_ci() or getenv("PLATFORMIO_DISABLE_PROGRESSBAR") == "true"
+    return (not get_setting("enable_prompts") or
+            getenv("PLATFORMIO_DISABLE_PROGRESSBAR") == "true")
diff --git a/platformio/boards/espressif.json b/platformio/boards/espressif.json
index a3a5b0a5..968bfb8d 100644
--- a/platformio/boards/espressif.json
+++ b/platformio/boards/espressif.json
@@ -116,7 +116,7 @@
         "upload": {
             "maximum_ram_size": 81920,
             "maximum_size": 4194304,
-            "resetmethod": "nodemcu",
+            "resetmethod": "ck",
             "require_upload_port" : true,
             "speed": 115200
         },
@@ -220,8 +220,8 @@
             "require_upload_port" : true,
             "speed": 115200
         },
-        "url": "http://www.esp8266.com/wiki/doku.php?id=esp8266-module-family",
-        "vendor": "Espressif"
+        "url": "http://www.espert.co",
+        "vendor": "ESPert"
     },
 
     "espresso_lite_v2": {
@@ -241,12 +241,12 @@
         "upload": {
             "maximum_ram_size": 81920,
             "maximum_size": 4194304,
-            "resetmethod": "nodemcu",
+            "resetmethod": "ck",
             "require_upload_port" : true,
             "speed": 115200
         },
-        "url": "http://www.esp8266.com/wiki/doku.php?id=esp8266-module-family",
-        "vendor": "Espressif"
+        "url": "http://www.espert.co",
+        "vendor": "ESPert"
     },
 
     "modwifi": {
@@ -293,7 +293,7 @@
             "maximum_size": 524288,
             "resetmethod": "ck",
             "require_upload_port" : true,
-            "speed": 921600
+            "speed": 115200
         },
         "url": "https://www.sparkfun.com/products/13231",
         "vendor": "SparkFun"
@@ -318,7 +318,7 @@
             "maximum_size": 524288,
             "resetmethod": "nodemcu",
             "require_upload_port" : true,
-            "speed": 921600
+            "speed": 115200
         },
         "url": "https://www.sparkfun.com/products/13231",
         "vendor": "SparkFun"
@@ -368,7 +368,7 @@
             "maximum_size": 4194304,
             "resetmethod": "nodemcu",
             "require_upload_port" : true,
-            "speed": 460800
+            "speed": 115200
         },
         "url": "http://www.wemos.cc/wiki/doku.php?id=en:d1",
         "vendor": "WeMos"
@@ -393,7 +393,7 @@
             "maximum_size": 4194304,
             "resetmethod": "nodemcu",
             "require_upload_port" : true,
-            "speed": 460800
+            "speed": 115200
         },
         "url": "http://www.wemos.cc/wiki/doku.php?id=en:d1_mini",
         "vendor": "WeMos"
@@ -441,7 +441,7 @@
         "upload": {
             "maximum_ram_size": 81920,
             "maximum_size": 4194304,
-            "resetmethod": "ck",
+            "resetmethod": "nodemcu",
             "require_upload_port" : true,
             "speed": 115200
         },
diff --git a/platformio/boards/misc.json b/platformio/boards/misc.json
index fa028efc..87fd21a7 100644
--- a/platformio/boards/misc.json
+++ b/platformio/boards/misc.json
@@ -175,16 +175,16 @@
         "platform": "atmelavr",
         "upload": {
             "maximum_ram_size": 16384,
-            "maximum_size": 131072,
-            "protocol": "stk500",
+            "maximum_size": 130048,
+            "protocol": "arduino",
             "require_upload_port" : true,
-            "speed": 57600
+            "speed": 115200
         },
         "url": "https://code.google.com/p/sanguino/",
         "vendor": "Sanguino"
     },
 
-    "sanguino_atmega12848m": {
+    "sanguino_atmega1284_8m": {
         "build": {
             "core": "arduino",
             "extra_flags": "-DARDUINO_ARCH_AVR -DAVR_SANGUINO",
@@ -197,32 +197,54 @@
         "platform": "atmelavr",
         "upload": {
             "maximum_ram_size": 16384,
-            "maximum_size": 131072,
-            "protocol": "stk500",
+            "maximum_size": 130048,
+            "protocol": "arduino",
             "require_upload_port" : true,
-            "speed": 19200
+            "speed": 57600
         },
         "url": "https://code.google.com/p/sanguino/",
         "vendor": "Sanguino"
     },
 
-    "sanguino_atmega1284m": {
+    "sanguino_atmega644": {
         "build": {
             "core": "arduino",
             "extra_flags": "-DARDUINO_ARCH_AVR -DAVR_SANGUINO",
-            "f_cpu": "20000000L",
-            "mcu": "atmega1284p",
+            "f_cpu": "16000000L",
+            "mcu": "atmega644",
             "variant": "sanguino"
         },
         "frameworks": ["arduino"],
-        "name": "Sanguino ATmega1284p (20MHz)",
+        "name": "Sanguino ATmega644 or ATmega644A (16 MHz)",
         "platform": "atmelavr",
         "upload": {
-            "maximum_ram_size": 16384,
-            "maximum_size": 131072,
-            "protocol": "stk500",
+            "maximum_ram_size": 4096,
+            "maximum_size": 64512,
+            "protocol": "arduino",
             "require_upload_port" : true,
-            "speed": 19200
+            "speed": 115200
+        },
+        "url": "https://code.google.com/p/sanguino/",
+        "vendor": "Sanguino"
+    },
+
+    "sanguino_atmega644_8m": {
+        "build": {
+            "core": "arduino",
+            "extra_flags": "-DARDUINO_ARCH_AVR -DAVR_SANGUINO",
+            "f_cpu": "8000000L",
+            "mcu": "atmega644",
+            "variant": "sanguino"
+        },
+        "frameworks": ["arduino"],
+        "name": "Sanguino ATmega644 or ATmega644A (8 MHz)",
+        "platform": "atmelavr",
+        "upload": {
+            "maximum_ram_size": 4096,
+            "maximum_size": 64512,
+            "protocol": "arduino",
+            "require_upload_port" : true,
+            "speed": 57600
         },
         "url": "https://code.google.com/p/sanguino/",
         "vendor": "Sanguino"
@@ -237,12 +259,34 @@
             "variant": "sanguino"
         },
         "frameworks": ["arduino"],
-        "name": "Sanguino ATmega644P",
+        "name": "Sanguino ATmega644P or ATmega644PA (16 MHz)",
         "platform": "atmelavr",
         "upload": {
             "maximum_ram_size": 4096,
-            "maximum_size": 63488,
-            "protocol": "stk500",
+            "maximum_size": 64512,
+            "protocol": "arduino",
+            "require_upload_port" : true,
+            "speed": 115200
+        },
+        "url": "https://code.google.com/p/sanguino/",
+        "vendor": "Sanguino"
+    },
+
+    "sanguino_atmega644p_8m": {
+        "build": {
+            "core": "arduino",
+            "extra_flags": "-DARDUINO_ARCH_AVR -DAVR_SANGUINO",
+            "f_cpu": "8000000L",
+            "mcu": "atmega644p",
+            "variant": "sanguino"
+        },
+        "frameworks": ["arduino"],
+        "name": "Sanguino ATmega644P or ATmega644PA (8 MHz)",
+        "platform": "atmelavr",
+        "upload": {
+            "maximum_ram_size": 4096,
+            "maximum_size": 64512,
+            "protocol": "arduino",
             "require_upload_port" : true,
             "speed": 57600
         },
diff --git a/platformio/boards/ststm32.json b/platformio/boards/ststm32.json
index a2746070..5840029c 100644
--- a/platformio/boards/ststm32.json
+++ b/platformio/boards/ststm32.json
@@ -541,5 +541,21 @@
         },
         "url": "https://developer.mbed.org/platforms/ST-Nucleo-L476RG/",
         "vendor": "ST"
+    },
+    "seeedArchMax": {
+        "build": {
+            "f_cpu": "168000000L",
+            "cpu": "cortex-m4",
+            "mcu": "stm32f407vet6"
+        },
+        "frameworks": ["mbed"],
+        "name": "SeeedStudio Arch Max",
+        "platform": "ststm32",
+        "upload": {
+            "maximum_ram_size": 196608,
+            "maximum_size": 524288
+        },
+        "url": "https://developer.mbed.org/platforms/Seeed-Arch-Max/",
+        "vendor": "SeeedStudio"
     }
 }
diff --git a/platformio/builder/scripts/frameworks/arduino.py b/platformio/builder/scripts/frameworks/arduino.py
index 4dc10571..fbe4ca15 100644
--- a/platformio/builder/scripts/frameworks/arduino.py
+++ b/platformio/builder/scripts/frameworks/arduino.py
@@ -251,6 +251,11 @@ if "variant" in BOARD_BUILDOPTS:
 
 envsafe = env.Clone()
 
+if BOARD_BUILDOPTS.get("core", None) == "teensy3":
+    libs.append("arm_cortex%sl_math" % (
+        "M4" if BOARD_BUILDOPTS.get("cpu") == "cortex-m4" else "M0")
+    )
+
 if "zero" in env.subst("$BOARD"):
     envsafe.Append(
         CFLAGS=[
diff --git a/platformio/builder/scripts/frameworks/mbed.py b/platformio/builder/scripts/frameworks/mbed.py
index 4bfc53cc..c80dc5a8 100644
--- a/platformio/builder/scripts/frameworks/mbed.py
+++ b/platformio/builder/scripts/frameworks/mbed.py
@@ -49,6 +49,7 @@ MBED_VARIANTS = {
     "blueboard_lpc11u24": "LPC11U24",
     "dipcortexm0": "LPC11U24",
     "seeeduinoArchPro": "ARCH_PRO",
+    "seeedArchMax": "ARCH_MAX",
     "ubloxc027": "UBLOX_C027",
     "lpc1114fn28": "LPC1114",
     "lpc11u35": "LPC11U35_401",
@@ -195,18 +196,27 @@ def get_build_flags(data):
     return flags
 
 
-def _mbed_whole_archive_hook(flags):
-    if (not isinstance(flags, list) or
+def _mbed_whole_archive_hook(libs):
+    if (not isinstance(libs, list) or
             env.get("BOARD_OPTIONS", {}).get("platform") != "ststm32"):
-        return flags
+        return libs
 
-    for pos, flag in enumerate(flags[:]):
-        if isinstance(flag, basestring):
-            continue
-        flags.insert(pos, "-Wl,-whole-archive")
-        flags.insert(pos + 2, "-Wl,-no-whole-archive")
+    _dynlibs = []
+    _stlibs = []
+    for l in libs:
+        if isinstance(l, basestring):
+            _stlibs.append(l)
+        else:
+            _dynlibs.append(l)
 
-    return flags
+    libs = []
+    if _dynlibs:
+        libs.append("-Wl,-whole-archive")
+        libs.extend(_dynlibs)
+        libs.append("-Wl,-no-whole-archive")
+    libs.extend(_stlibs)
+
+    return libs
 
 
 board_type = env.subst("$BOARD")
@@ -257,7 +267,7 @@ env.Append(
 # Target: Build mbed Library
 #
 
-libs = [l for l in eixdata.get("STDLIBS", []) if l not in env.get("LIBS")]
+libs = [l for l in eixdata.get("STDLIBS", []) if l not in env.get("LIBS", [])]
 libs.extend(["mbed", "c", "gcc"])
 
 libs.append(env.Library(
diff --git a/platformio/builder/scripts/teensy.py b/platformio/builder/scripts/teensy.py
index 310ad8d0..7f9b52c8 100644
--- a/platformio/builder/scripts/teensy.py
+++ b/platformio/builder/scripts/teensy.py
@@ -29,7 +29,9 @@ elif env.get("BOARD_OPTIONS", {}).get("build", {}).get("core") == "teensy3":
     SConscript(env.subst(join("$PIOBUILDER_DIR", "scripts", "basearm.py")))
     env.Append(
         LINKFLAGS=[
-            "-Wl,--defsym=__rtc_localtime=$UNIX_TIME"
+            "-Wl,--defsym=__rtc_localtime=$UNIX_TIME",
+            "-fsingle-precision-constant",
+            "--specs=nano.specs"
         ],
         CCFLAGS=[
             "-fsingle-precision-constant"
diff --git a/platformio/commands/ci.py b/platformio/commands/ci.py
index 50978fda..602ef67d 100644
--- a/platformio/commands/ci.py
+++ b/platformio/commands/ci.py
@@ -131,11 +131,11 @@ def _copy_contents(dst_dir, contents):
     dst_dir_name = basename(dst_dir)
 
     if dst_dir_name == "src" and len(items['dirs']) == 1:
-        copytree(list(items['dirs']).pop(), dst_dir)
+        copytree(list(items['dirs']).pop(), dst_dir, symlinks=True)
     else:
         makedirs(dst_dir)
         for d in items['dirs']:
-            copytree(d, join(dst_dir, basename(d)))
+            copytree(d, join(dst_dir, basename(d)), symlinks=True)
 
     if not items['files']:
         return
diff --git a/platformio/commands/init.py b/platformio/commands/init.py
index b2c9d75e..d9b48288 100644
--- a/platformio/commands/init.py
+++ b/platformio/commands/init.py
@@ -120,10 +120,9 @@ def init_base_project(project_dir):
 
     lib_dir = join(project_dir, "lib")
     src_dir = join(project_dir, "src")
-    with util.cd(project_dir):
-        config = util.get_project_config()
-        if config.has_option("platformio", "src_dir"):
-            src_dir = join(project_dir, config.get("platformio", "src_dir"))
+    config = util.get_project_config(platformio_ini)
+    if config.has_option("platformio", "src_dir"):
+        src_dir = join(project_dir, config.get("platformio", "src_dir"))
 
     for d in (src_dir, lib_dir):
         if not isdir(d):
@@ -263,23 +262,25 @@ def fill_project_envs(  # pylint: disable=too-many-arguments,too-many-locals
         env_prefix, force_download):
     builtin_boards = get_boards()
     content = []
-    used_envs = []
+    used_boards = []
     used_platforms = []
 
-    with open(platformio_ini) as f:
-        used_envs = [l.strip() for l in f.read().splitlines() if
-                     l.strip().startswith("[env:")]
+    config = util.get_project_config(platformio_ini)
+    for section in config.sections():
+        if not all([section.startswith("env:"),
+                    config.has_option(section, "board")]):
+            continue
+        used_boards.append(config.get(section, "board"))
 
     for type_ in board_types:
         data = builtin_boards[type_]
         used_platforms.append(data['platform'])
-        env_name = "[env:%s%s]" % (env_prefix, type_)
 
-        if env_name in used_envs:
+        if type_ in used_boards:
             continue
 
         content.append("")
-        content.append(env_name)
+        content.append("[env:%s%s]" % (env_prefix, type_))
         content.append("platform = %s" % data['platform'])
 
         # find default framework for board
diff --git a/platformio/downloader.py b/platformio/downloader.py
index 25e409ae..bbb90e07 100644
--- a/platformio/downloader.py
+++ b/platformio/downloader.py
@@ -56,18 +56,21 @@ class FileDownloader(object):
         return self._request.headers['last-modified']
 
     def get_size(self):
+        if "content-length" not in self._request.headers:
+            return -1
         return int(self._request.headers['content-length'])
 
     def start(self):
         itercontent = self._request.iter_content(chunk_size=self.CHUNK_SIZE)
         f = open(self._destination, "wb")
-        chunks = int(ceil(self.get_size() / float(self.CHUNK_SIZE)))
 
-        if app.is_disabled_progressbar():
+        if app.is_disabled_progressbar() or self.get_size() == -1:
             click.echo("Downloading...")
-            for _ in range(0, chunks):
-                f.write(next(itercontent))
+            for chunk in itercontent:
+                if chunk:
+                    f.write(chunk)
         else:
+            chunks = int(ceil(self.get_size() / float(self.CHUNK_SIZE)))
             with click.progressbar(length=chunks, label="Downloading") as pb:
                 for _ in pb:
                     f.write(next(itercontent))
@@ -78,7 +81,7 @@ class FileDownloader(object):
 
     def verify(self, sha1=None):
         _dlsize = getsize(self._destination)
-        if _dlsize != self.get_size():
+        if self.get_size() != -1 and _dlsize != self.get_size():
             raise FDSizeMismatch(_dlsize, self._fname, self.get_size())
 
         if not sha1:
diff --git a/platformio/maintenance.py b/platformio/maintenance.py
index 441f5072..4cc417cf 100644
--- a/platformio/maintenance.py
+++ b/platformio/maintenance.py
@@ -147,12 +147,12 @@ def after_upgrade(ctx):
     if not getenv("PLATFORMIO_IDE"):
         click.echo("- %s PlatformIO IDE for IoT development > %s" % (
             click.style("try", fg="cyan"),
-            click.style("http://platformio.org/#!/platformio-ide", fg="cyan")
+            click.style("http://platformio.org/platformio-ide", fg="cyan")
         ))
     if not util.is_ci():
         click.echo("- %s to keep PlatformIO alive! > %s" % (
             click.style("donate", fg="cyan"),
-            click.style("http://platformio.org/#!/donate", fg="cyan")
+            click.style("http://platformio.org/donate", fg="cyan")
         ))
 
     click.echo("*" * terminal_width)
diff --git a/platformio/platforms/linux_arm.py b/platformio/platforms/linux_arm.py
index 3517441a..79c03ad5 100644
--- a/platformio/platforms/linux_arm.py
+++ b/platformio/platforms/linux_arm.py
@@ -26,7 +26,7 @@ class Linux_armPlatform(BasePlatform):
         Using host OS (Mac OS X, Linux ARM) you can build native application
         for Linux ARM platform.
 
-        http://platformio.org/#!/platforms/linux_arm
+        http://platformio.org/platforms/linux_arm
     """
 
     PACKAGES = {
diff --git a/platformio/platforms/linux_i686.py b/platformio/platforms/linux_i686.py
index 0d889e67..11f1ac01 100644
--- a/platformio/platforms/linux_i686.py
+++ b/platformio/platforms/linux_i686.py
@@ -26,7 +26,7 @@ class Linux_i686Platform(BasePlatform):
         Using host OS (Mac OS X or Linux 32-bit) you can build native
         application for Linux i686 platform.
 
-        http://platformio.org/#!/platforms/linux_i686
+        http://platformio.org/platforms/linux_i686
     """
 
     PACKAGES = {
diff --git a/platformio/platforms/linux_x86_64.py b/platformio/platforms/linux_x86_64.py
index 876ac562..c3bf330e 100644
--- a/platformio/platforms/linux_x86_64.py
+++ b/platformio/platforms/linux_x86_64.py
@@ -26,7 +26,7 @@ class Linux_x86_64Platform(BasePlatform):
         Using host OS (Mac OS X or Linux 64-bit) you can build native
         application for Linux x86_64 platform.
 
-        http://platformio.org/#!/platforms/linux_i686
+        http://platformio.org/platforms/linux_i686
     """
 
     PACKAGES = {
diff --git a/platformio/platforms/native.py b/platformio/platforms/native.py
index 0e61965c..9c4ed8bb 100644
--- a/platformio/platforms/native.py
+++ b/platformio/platforms/native.py
@@ -22,7 +22,7 @@ class NativePlatform(BasePlatform):
     This platform uses built-in toolchains (preferable based on GCC),
     frameworks, libs from particular OS where it will be run.
 
-    http://platformio.org/#!/platforms/native
+    http://platformio.org/platforms/native
     """
 
     PACKAGES = {
diff --git a/platformio/platforms/teensy.py b/platformio/platforms/teensy.py
index 3678ff15..45e62562 100644
--- a/platformio/platforms/teensy.py
+++ b/platformio/platforms/teensy.py
@@ -22,8 +22,7 @@ class TeensyPlatform(BasePlatform):
     Teensy is a complete USB-based microcontroller development system, in
     a very small footprint, capable of implementing many types of projects.
     All programming is done via the USB port. No special programmer is
-    needed, only a standard "Mini-B" USB cable and a PC or Macintosh with
-    a USB port.
+    needed, only a standard USB cable and a PC or Macintosh with a USB port.
 
     https://www.pjrc.com/teensy
     """
diff --git a/platformio/platforms/windows_x86.py b/platformio/platforms/windows_x86.py
index 260e5ac6..bf52cc1c 100644
--- a/platformio/platforms/windows_x86.py
+++ b/platformio/platforms/windows_x86.py
@@ -23,7 +23,7 @@ class Windows_x86Platform(BasePlatform):
         Using host OS (Windows, Linux 32/64 or Mac OS X) you can build native
         application for Windows x86 platform.
 
-        http://platformio.org/#!/platforms/windows_x86
+        http://platformio.org/platforms/windows_x86
     """
 
     PACKAGES = {
diff --git a/platformio/util.py b/platformio/util.py
index 032f8d38..8af2e859 100644
--- a/platformio/util.py
+++ b/platformio/util.py
@@ -20,11 +20,12 @@ import re
 import subprocess
 import sys
 from glob import glob
-from os.path import abspath, basename, dirname, expanduser, isdir, isfile, join
+from os.path import (abspath, basename, dirname, expanduser, isdir, isfile,
+                     join, splitdrive)
 from platform import system, uname
 from threading import Thread
 
-from platformio import __apiurl__, __version__, exception
+from platformio import __apiip__, __apiurl__, __version__, exception
 
 # pylint: disable=wrong-import-order
 try:
@@ -160,6 +161,12 @@ def get_home_dir():
         join(expanduser("~"), ".platformio")
     )
 
+    if "windows" in get_systype():
+        try:
+            home_dir.encode("utf8")
+        except UnicodeDecodeError:
+            home_dir = splitdrive(home_dir)[0] + "\.platformio"
+
     if not isdir(home_dir):
         os.makedirs(home_dir)
 
@@ -213,12 +220,13 @@ def get_projectdata_dir():
     )
 
 
-def get_project_config():
-    path = join(get_project_dir(), "platformio.ini")
-    if not isfile(path):
+def get_project_config(ini_path=None):
+    if not ini_path:
+        ini_path = join(get_project_dir(), "platformio.ini")
+    if not isfile(ini_path):
         raise exception.NotPlatformProject(get_project_dir())
     cp = ConfigParser()
-    cp.read(path)
+    cp.read(ini_path)
     return cp
 
 
@@ -321,18 +329,26 @@ def get_request_defheaders():
     )}
 
 
-def get_api_result(path, params=None, data=None):
+def get_api_result(path, params=None, data=None, skipdns=False):
     import requests
     result = None
     r = None
 
+    headers = get_request_defheaders()
+    url = __apiurl__
+    if skipdns:
+        url = "http://%s" % __apiip__
+        headers['host'] = __apiurl__[__apiurl__.index("://")+3:]
+
     try:
         if data:
-            r = requests.post(__apiurl__ + path, params=params, data=data,
-                              headers=get_request_defheaders())
+            r = requests.post(
+                url + path, params=params, data=data, headers=headers,
+                timeout=(5, 13)
+            )
         else:
-            r = requests.get(__apiurl__ + path, params=params,
-                             headers=get_request_defheaders())
+            r = requests.get(
+                url + path, params=params, headers=headers, timeout=(5, 13))
         result = r.json()
         r.raise_for_status()
     except requests.exceptions.HTTPError as e:
@@ -340,7 +356,10 @@ def get_api_result(path, params=None, data=None):
             raise exception.APIRequestError(result['errors'][0]['title'])
         else:
             raise exception.APIRequestError(e)
-    except requests.exceptions.ConnectionError:
+    except (requests.exceptions.ConnectionError,
+            requests.exceptions.ConnectTimeout):
+        if not skipdns:
+            return get_api_result(path, params, data, skipdns=True)
         raise exception.APIRequestError(
             "Could not connect to PlatformIO Registry Service. "
             "Please try later.")
diff --git a/scripts/99-platformio-udev.rules b/scripts/99-platformio-udev.rules
index fe59cb18..5ac03b12 100644
--- a/scripts/99-platformio-udev.rules
+++ b/scripts/99-platformio-udev.rules
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# UDEV Rules for PlatformIO supported boards, http://platformio.org/#!/boards
+# UDEV Rules for PlatformIO supported boards, http://platformio.org/boards
 #
 # The latest version of this file may be found at:
 # 	https://github.com/platformio/platformio/blob/develop/scripts/99-platformio-udev.rules
diff --git a/scripts/docspregen.py b/scripts/docspregen.py
index 176e3308..61d8835e 100644
--- a/scripts/docspregen.py
+++ b/scripts/docspregen.py
@@ -77,7 +77,7 @@ def generate_boards(boards):
     return "\n".join(lines + [""])
 
 
-def generate_packages(packages, is_embedded):
+def generate_packages(platform, packages, is_embedded):
     if not packages:
         return
     allpackages = get_packages()
@@ -108,12 +108,22 @@ Packages
 .. warning::
     **Linux Users:** Don't forget to install "udev" rules file
     `99-platformio-udev.rules <https://github.com/platformio/platformio/blob/develop/scripts/99-platformio-udev.rules>`_ (an instruction is located in the file).
-
-    **Windows Users:** Please check that you have correctly installed USB driver
-    from board manufacturer
+""")
+        if platform == "teensy":
+            lines.append("""
+    **Windows Users:** Teensy programming uses only Windows built-in HID
+    drivers. When Teensy is programmed to act as a USB Serial device,
+    Windows XP, Vista, 7 and 8 require `this serial driver
+    <http://www.pjrc.com/teensy/serial_install.exe>`_
+    is needed to access the COM port your program uses. No special driver
+    installation is necessary on Windows 10.
+""")
+        else:
+            lines.append("""
+    **Windows Users:** Please check that you have correctly installed USB
+    driver from board manufacturer
 
 """)
-
     return "\n".join(lines)
 
 
@@ -151,7 +161,7 @@ For more detailed information please visit `vendor site <%s>`_.""" %
     #
     # Packages
     #
-    _packages_content = generate_packages(p.get_packages(), p.is_embedded())
+    _packages_content = generate_packages(name, p.get_packages(), p.is_embedded())
     if _packages_content:
         lines.append(_packages_content)
 
@@ -200,7 +210,7 @@ Boards
 
 .. note::
     * You can list pre-configured boards by :ref:`cmd_boards` command or
-      `PlatformIO Boards Explorer <http://platformio.org/#!/boards>`_
+      `PlatformIO Boards Explorer <http://platformio.org/boards>`_
     * For more detailed ``board`` information please scroll tables below by
       horizontal.
 """)
@@ -282,7 +292,7 @@ Boards
 
 .. note::
     * You can list pre-configured boards by :ref:`cmd_boards` command or
-      `PlatformIO Boards Explorer <http://platformio.org/#!/boards>`_
+      `PlatformIO Boards Explorer <http://platformio.org/boards>`_
     * For more detailed ``board`` information please scroll tables below by horizontal.
 """)