diff --git a/HISTORY.rst b/HISTORY.rst
index 96ea1b2f..599e135e 100644
--- a/HISTORY.rst
+++ b/HISTORY.rst
@@ -33,7 +33,7 @@ Release History
 * Refactored *Library Dependency Finder* (issues
   `#48 <https://github.com/ivankravets/platformio/issues/48>`_,
   `#50 <https://github.com/ivankravets/platformio/issues/50>`_,
-  `#55 <https://github.com/ivankravets/platformio/issues/55>`_)
+  `#55 <https://github.com/ivankravets/platformio/pull/55>`_)
 * Added `src_dir <http://docs.platformio.org/en/latest/projectconf.html#src-dir>`__
   option to ``[platformio]`` section of
   `platformio.ini <http://docs.platformio.org/en/latest/projectconf.html>`__
@@ -81,7 +81,7 @@ Release History
 * Added ``--json-output`` option to
   `platformio list <http://docs.platformio.org/en/latest/userguide/cmd_list.html>`__,
   `platformio serialports list <http://docs.platformio.org/en/latest/userguide/cmd_serialports.html>`__ and
-  `platformio lib list <http://docs.platformio.org/en/latest/userguide/cmd_lib_list.html>`__
+  `platformio lib list <http://docs.platformio.org/en/latest/userguide/lib/cmd_list.html>`__
   commands which allows to return the output in `JSON <http://en.wikipedia.org/wiki/JSON>`_ format
   (`issue #42 <https://github.com/ivankravets/platformio/issues/42>`_)
 * Fixed missing auto-uploading by default after `platformio init <http://docs.platformio.org/en/latest/userguide/cmd_init.html>`__
@@ -130,7 +130,7 @@ Release History
   `platformio run <http://docs.platformio.org/en/latest/userguide/cmd_run.html>`__
   command when PlatformIO isn't installed properly
 * Fixed example for `Eclipse IDE with Tiva board <https://github.com/ivankravets/platformio/tree/develop/examples/ide-eclipse>`_
-  (`issue #32 <https://github.com/ivankravets/platformio/issues/32>`_)
+  (`issue #32 <https://github.com/ivankravets/platformio/pull/32>`_)
 * Upgraded `Eclipse Project Examples <https://github.com/ivankravets/platformio/tree/develop/examples/ide-eclipse>`_
   to latest *Luna* and *PlatformIO* releases
 
@@ -199,7 +199,7 @@ Release History
 * Disabled default warning flag "-Wall"
 * Added auto-conversation from \*.ino to valid \*.cpp for Arduino/Energia
   frameworks (`issue #7 <https://github.com/ivankravets/platformio/issues/7>`_)
-* Added `Arduino example <https://github.com/ivankravets/platformio/tree/develop/examples/arduino-adafruit-library>`_
+* Added `Arduino example <https://github.com/ivankravets/platformio/tree/develop/examples/>`_
   with external library (*Adafruit CC3000*)
 * Implemented `platformio upgrade <http://docs.platformio.org/en/latest/userguide/cmd_upgrade.html>`_
   command and "auto-check" for the latest
@@ -217,7 +217,7 @@ Release History
 * Allowed to override some of settings via system environment variables
   such as: ``$PIOSRCBUILD_FLAGS`` and ``$PIOENVS_DIR``
 * Added ``--upload-port`` option for `platformio run <http://docs.platformio.org/en/latest/userguide/cmd_run.html#cmdoption--upload-port>`__ command
-* Implemented (especially for `SmartAnthill <http://smartanthill.ikravets.com/>`_)
+* Implemented (especially for `SmartAnthill <http://docs.smartanthill.ikravets.com/>`_)
   `platformio run -t uploadlazy <http://docs.platformio.org/en/latest/userguide/cmd_run.html>`_
   target (no dependencies to framework libs, ELF and etc.)
 * Allowed to skip default packages via `platformio install --skip-default-package <http://docs.platformio.org/en/latest/userguide/cmd_install.html#cmdoption--skip-default>`_
@@ -248,7 +248,7 @@ Release History
 
 * Resolved `issue #1 "Build referred libraries" <https://github.com/ivankravets/platformio/issues/1>`_
 * Renamed project's "libs" directory to "lib"
-* Added `arduino-internal-library <https://github.com/ivankravets/platformio/tree/develop/examples/arduino-internal-library>`_ example
+* Added `arduino-internal-library <https://github.com/ivankravets/platformio/tree/develop/examples/>`_ example
 * Changed to beta status
 
 
diff --git a/docs/installation.rst b/docs/installation.rst
index cc106be4..bd860f10 100644
--- a/docs/installation.rst
+++ b/docs/installation.rst
@@ -3,7 +3,7 @@
 Installation
 ============
 
-**PlatformIO** is written in `Python <http://python.org/download/>`_ and works
+**PlatformIO** is written in `Python <https://www.python.org/downloads/>`_ and works
 on Mac OS X, Linux, Windows OS and *ARM*-based credit-card
 computers (`Raspberry Pi <http://www.raspberrypi.org>`_,
 `BeagleBoard <http://beagleboard.org>`_,
@@ -18,7 +18,7 @@ System requirements
     * Mac OS X
     * Linux, +ARM
     * Windows
-* `Python 2.6 or Python 2.7 <http://python.org/download/>`_
+* `Python 2.6 or Python 2.7 <https://www.python.org/downloads/>`_
 
 All commands below should be executed in
 `Command-line <http://en.wikipedia.org/wiki/Command-line_interface>`_
diff --git a/docs/librarymanager/index.rst b/docs/librarymanager/index.rst
index 3e9604ef..994437fd 100644
--- a/docs/librarymanager/index.rst
+++ b/docs/librarymanager/index.rst
@@ -21,5 +21,5 @@ You don't need to bother for finding the latest version of library. Due to
     creating
     User Guide <../userguide/lib/index.rst>
 
-.. [#] Inspired by `npm <https://www.npmjs.org>`_ and `bower
+.. [#] Inspired by `npm <https://www.npmjs.com/>`_ and `bower
     <http://bower.io>`_ package managers for web.
diff --git a/docs/platforms/atmelavr.rst b/docs/platforms/atmelavr.rst
index 090149c6..cba4eae4 100644
--- a/docs/platforms/atmelavr.rst
+++ b/docs/platforms/atmelavr.rst
@@ -433,63 +433,63 @@ Microduino
       - RAM
     * - ``168pa8m``
       - `Microduino Core (ATmega168P, 3.3V)
-        <http://www.microduino.cc/wiki/index.php?title=Microduino-Core>`_
+        <https://www.microduino.cc/wiki/index.php?title=Microduino-Core>`_
       - ATmega168P ``atmega168p``
       - 8 MHz ``8000000L``
       - 16 Kb
       - 1 Kb
     * - ``168pa16m``
       - `Microduino Core (ATmega168P, 5V)
-        <http://www.microduino.cc/wiki/index.php?title=Microduino-Core>`_
+        <https://www.microduino.cc/wiki/index.php?title=Microduino-Core>`_
       - ATmega168P ``atmega168p``
       - 16 MHz ``16000000L``
       - 16 Kb
       - 1 Kb
     * - ``328p8m``
       - `Microduino Core (ATmega328P, 3.3V)
-        <http://www.microduino.cc/wiki/index.php?title=Microduino-Core>`_
+        <https://www.microduino.cc/wiki/index.php?title=Microduino-Core>`_
       - ATmega328P ``atmega328p``
       - 8 MHz ``8000000L``
       - 32 Kb
       - 2 Kb
     * - ``328p16m``
       - `Microduino Core (ATmega328P, 5V)
-        <http://www.microduino.cc/wiki/index.php?title=Microduino-Core>`_
+        <https://www.microduino.cc/wiki/index.php?title=Microduino-Core>`_
       - ATmega328P ``atmega328p``
       - 16 MHz ``16000000L``
       - 32 Kb
       - 2 Kb
     * - ``644pa8m``
       - `Microduino Core+ (ATmega644PA, 3.3V)
-        <http://www.microduino.cc/wiki/index.php?title=Microduino-Core%2B>`_
+        <https://www.microduino.cc/wiki/index.php?title=Microduino-Core%2B>`_
       - ATmega644PA ``atmega644p``
       - 8 MHz ``8000000L``
       - 64 Kb
       - 4 Kb
     * - ``644pa16m``
       - `Microduino Core+ (ATmega644PA, 5V)
-        <http://www.microduino.cc/wiki/index.php?title=Microduino-Core%2B>`_
+        <https://www.microduino.cc/wiki/index.php?title=Microduino-Core%2B>`_
       - ATmega644PA ``atmega644p``
       - 16 MHz ``16000000L``
       - 64 Kb
       - 4 Kb
     * - ``1284p8m``
       - `Microduino Core+ (Atmega1284P, 3.3V)
-        <http://www.microduino.cc/wiki/index.php?title=Microduino-Core%2B>`_
+        <https://www.microduino.cc/wiki/index.php?title=Microduino-Core%2B>`_
       - Atmega1284P ``atmega1284p``
       - 8 MHz ``8000000L``
       - 128 Kb
       - 16 Kb
     * - ``1284p16m``
       - `Microduino Core+ (Atmega1284P, 5V)
-        <http://www.microduino.cc/wiki/index.php?title=Microduino-Core%2B>`_
+        <https://www.microduino.cc/wiki/index.php?title=Microduino-Core%2B>`_
       - Atmega1284P ``atmega1284p``
       - 16 MHz ``16000000L``
       - 128 Kb
       - 16 Kb
     * - ``32u416m``
       - `Microduino-Core USB
-        <http://www.microduino.cc/wiki/index.php?title=Microduino-CoreUSB>`_
+        <https://www.microduino.cc/wiki/index.php?title=Microduino-CoreUSB>`_
       - ATmega32u4 ``atmega32u4``
       - 16 MHz ``16000000L``
       - 32 Kb
@@ -497,7 +497,7 @@ Microduino
 
 
 More detailed information you can find here
-`Microduino boards <http://www.microduino.cc/wiki/index.php?title=Main_Page>`_.
+`Microduino boards <https://www.microduino.cc/wiki/index.php?title=Main_Page>`_.
 
 
 Raspduino