diff --git a/HISTORY.rst b/HISTORY.rst
index 1e3ff5c5..50769763 100644
--- a/HISTORY.rst
+++ b/HISTORY.rst
@@ -1,6 +1,14 @@
 Release History
 ===============
 
+0.10.0 (?)
+----------
+
+* Added `example with uploading firmware <http://docs.platformio.ikravets.com/en/latest/projectconf.html#examples>`_
+  via USB programmer (USBasp) to
+  `atmelavr <http://docs.platformio.ikravets.com/en/latest/platforms/atmelavr.html>`_
+  MCUs (`issue #35 <https://github.com/ivankravets/platformio/issues/35>`_)
+
 0.9.2 (2014-12-10)
 ------------------
 
@@ -10,7 +18,6 @@ Release History
   (`issue #34 <https://github.com/ivankravets/platformio/issues/34>`_)
 * Fixed compilation bug on *Windows* with installed *MSVC* (`issue #18 <https://github.com/ivankravets/platformio/issues/18>`_)
 
-
 0.9.1 (2014-12-05)
 ------------------
 
diff --git a/docs/projectconf.rst b/docs/projectconf.rst
index aa3bf1ba..0c017f4f 100644
--- a/docs/projectconf.rst
+++ b/docs/projectconf.rst
@@ -246,7 +246,7 @@ Examples
    ``board_*`` and ``upload_*`` options (use only ``board`` option) and Arduino
    Wiring-based Framework
 
-.. code-block::   ini
+.. code-block:: ini
 
     [env:atmelavr_arduino_uno_board]
     platform = atmelavr
@@ -261,7 +261,7 @@ Examples
    auto pre-configured ``board_*`` and ``upload_*`` options (use only
    ``board`` option) and Arduino Wiring-based Framework
 
-.. code-block::   ini
+.. code-block:: ini
 
     [env:atmelavr_microduino_core_board]
     platform = atmelavr
@@ -276,7 +276,7 @@ Examples
    auto pre-configured ``board_*`` and ``upload_*`` options (use only
    ``board`` option) and Arduino Wiring-based Framework
 
-.. code-block::   ini
+.. code-block:: ini
 
     [env:atmelavr_raspduino_board]
     platform = atmelavr
@@ -292,7 +292,7 @@ Examples
 4. :ref:`platform_atmelavr`: Embedded board that is based on ATmega168 MCU with
    "arduino" bootloader
 
-.. code-block::   ini
+.. code-block:: ini
 
     [env:atmelavr_atmega168_board]
     platform = atmelavr
@@ -309,11 +309,23 @@ Examples
     targets = upload
 
 
-5. :ref:`platform_timsp430`: TI MSP430G2553 LaunchPad with auto pre-configured
+5. Upload firmware via USB programmer (USBasp) to :ref:`platform_atmelavr`
+   microcontrollers
+
+.. code-block:: ini
+
+    [env:atmelavr_usbasp]
+    platform = atmelavr
+    framework = arduino
+    board = pro8MHzatmega328
+    upload_protocol = usbasp -B5
+
+
+6. :ref:`platform_timsp430`: TI MSP430G2553 LaunchPad with auto pre-configured
    ``board_*`` and ``upload_*`` options (use only ``board`` option) and Energia
    Wiring-based Framework
 
-.. code-block::   ini
+.. code-block:: ini
 
     [env:timsp430_g2553_launchpad]
     platform = timsp430
@@ -321,9 +333,9 @@ Examples
     board = lpmsp430g2553
 
 
-6. :ref:`platform_timsp430`: Embedded board that is based on MSP430G2553 MCU
+7. :ref:`platform_timsp430`: Embedded board that is based on MSP430G2553 MCU
 
-.. code-block::   ini
+.. code-block:: ini
 
     [env:timsp430_g2553_board]
     platform = timsp430
@@ -336,11 +348,11 @@ Examples
     targets = upload
 
 
-5. :ref:`platform_titiva`: TI Tiva C ARM Series TM4C123G LaunchPad with auto
+8. :ref:`platform_titiva`: TI Tiva C ARM Series TM4C123G LaunchPad with auto
    pre-configured ``board_*`` and ``upload_*`` options (use only ``board``
    option) and Energia Wiring-based Framework
 
-.. code-block::   ini
+.. code-block:: ini
 
     [env:titiva_tm4c1230c3pm_launchpad]
     platform = titiva