diff --git a/README.md b/README.md
index f5ce9624..798209ad 100644
--- a/README.md
+++ b/README.md
@@ -1,21 +1,29 @@
 i2pd
 ====
 
-i2pd is a full-featured C++ implementation of 
-[I2P](https://geti2p.net/en/about/intro) client.
+i2pd (I2P Daemon) is a full-featured C++ implementation of I2P client.
 
-I2P (Invisible Internet Project) is anonymous network which works on top of 
-public Internet. Privacy and anonymity are achieved by strong encryption and 
-bouncing your traffic through thousands of I2P nodes all around the world.
+I2P (Invisible Internet Protocol) is a universal anonymous network layer. 
+All communications over I2P are anonymous and end-to-end encrypted, participants
+don't reveal their real IP addresses. 
 
-We are building network which helps people to communicate and share information 
+I2P client is a software used for building and using anonymous I2P 
+networks. Such networks can work on top of ordinary Internet connection, LAN
+and even wireless mesh-networks. 
+
+I2P is commonly used for anonymous peer-to-peer applications (filesharing, 
+cryptocurrencies) and anonymous client-server applications (websites, instant
+messengers, chat-servers).
+
+I2P allows people from all around the world to communicate and share information
 without restrictions.
 
 * [Website](http://i2pd.website)
 * [Documentation](https://i2pd.readthedocs.io/en/latest/)
 * [Wiki](https://github.com/PurpleI2P/i2pd/wiki)
 * [Tickets/Issues](https://github.com/PurpleI2P/i2pd/issues)
-* [Twitter](https://twitter.com/i2porignal)
+* [Specifications](https://geti2p.net/spec)
+* [Twitter](https://twitter.com/hashtag/i2pd)
 
 Installing
 ----------
diff --git a/docs/build_notes_windows.md b/docs/build_notes_windows.md
index a217d80d..2b4b96b6 100644
--- a/docs/build_notes_windows.md
+++ b/docs/build_notes_windows.md
@@ -87,7 +87,19 @@ You should be able to run ./i2pd . If you need to start from the new
 shell, consider starting *MinGW-w64 Win32 Shell* instead of *MSYS2 Shell* as
 it adds`/minw32/bin` to the PATH.
 
+### UPnP
+You can install it through the MSYS2
+and build with USE_UPNP key.
 
+```bash
+pacman -S mingw-w64-i686-miniupnpc  
+make USE_UPNP=yes  
+```
+or
+```bash
+pacman -S mingw-w64-x86_64-miniupnpc  
+make USE_UPNP=yes
+```
 
 Using Visual Studio
 -------------------
@@ -160,20 +172,7 @@ port. You'd want to have include headers around to build i2pd with
 support for this. Unpack client source code in a sibling folder,
 e.g. C:\dev\miniupnpc . You may want to remove version number from
 folder name included in downloaded archive.
-
-You can also install it through the MSYS2
-and build with USE_UPNP key.
-
-```bash
-pacman -S mingw-w64-i686-miniupnpc  
-make USE_UPNP=yes  
-```
-or
-```bash
-pacman -S mingw-x86_64-miniupnpc  
-make USE_UPNP=yes  
-```
-
+ 
 ### Creating Visual Studio project
 
 Start CMake GUI, navigate to i2pd directory, choose building directory,  e.g. ./out, and configure options.