diff --git a/HISTORY.rst b/HISTORY.rst
index c937493f..a838388e 100644
--- a/HISTORY.rst
+++ b/HISTORY.rst
@@ -8,6 +8,8 @@ PlatformIO 2.0
 ~~~~~~~~~~~~~~~~~~
 
 * Better integration of PlatformIO Builder with PlatformIO IDE Linter
+* Fixed issue with removing temporary file while converting ``*.ino`` to
+  ``*.cpp``
 
 2.8.2 (2016-01-29)
 ~~~~~~~~~~~~~~~~~~
diff --git a/docs/ide/atom.rst b/docs/ide/atom.rst
index 79336e7b..cbac0e2c 100644
--- a/docs/ide/atom.rst
+++ b/docs/ide/atom.rst
@@ -33,7 +33,7 @@ PlatformIO IDE is the next generation integrated development environment for IoT
 * Built-in Terminal with :ref:`PlatformIO CLI <userguide>` tool (``pio``, ``platformio``)
 
 PlatformIO IDE is based on GitHub's `Atom <https://atom.io>`_ source
-code editor that's modern, approachable, yet hackable to the core—a tool you
+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.
 
diff --git a/platformio/__init__.py b/platformio/__init__.py
index 591d4a28..d94390cf 100644
--- a/platformio/__init__.py
+++ b/platformio/__init__.py
@@ -14,7 +14,7 @@
 
 import sys
 
-VERSION = (2, 8, "3.dev0")
+VERSION = (2, 8, "3.dev1")
 __version__ = ".".join([str(s) for s in VERSION])
 
 __title__ = "platformio"
diff --git a/platformio/builder/tools/piomisc.py b/platformio/builder/tools/piomisc.py
index a71e6c94..dc768ba1 100644
--- a/platformio/builder/tools/piomisc.py
+++ b/platformio/builder/tools/piomisc.py
@@ -116,8 +116,10 @@ def ConvertInoToCpp(env):
     def delete_tmpcpp_file(file_):
         try:
             remove(file_)
-        except WindowsError:  # pylint: disable=undefined-variable
-            pass
+        except:  # pylint: disable=bare-except
+            if isfile(file_):
+                print ("Warning: Could not remove temporary file '%s'. "
+                       "Please remove it manually." % file_)
 
     ino_nodes = (env.Glob(join("$PROJECTSRC_DIR", "*.ino")) +
                  env.Glob(join("$PROJECTSRC_DIR", "*.pde")))