Merge branch 'master' of github.com:jclehner/nmrpflash

diff --cc README.md
index cee0e69beb547894761dd8b43eb0add9e0ff5b54,7f7a4c6313f86fc0272ebf216efa435996444f70..047484cbc7f26d7466cbab4ad3a8341db9de8d7b
--- 1/README.md
--- 2/README.md
+++ b/README.md
@@@ -74,9 -74,9 +74,9 @@@ In any case, run `nmrpflash` with `-vvv
  
  You must install your Linux distribution's `libpcap` package. In
  openSUSE 42 for example, install `libpcap0.8` (cheers to
 -[@gvcastellon](https://github.com/gvcastellon).
 +[@gvcastellon](https://github.com/gvcastellon)).
  
- ###### Windows: "The program can't start because wpcap.dll is missing"
+ ###### "The program can't start because wpcap.dll is missing" (Windows)
  
  Install [WinPcap](https://www.winpcap.org/install/default.htm).
  
@@@ -104,22 -104,9 +104,9 @@@ the `-c` flag instead of the `-f` flag
  
  `# nmrpflash -i eth0 -a 192.168.1.254 -c "busybox tftp -p -l EX2700-V1.0.1.8.img 192.168.1.254"`
  
- <strike>
- If the upload still fails, and you're on Windows, try executing the following command before
- running `nmrpflash`:
- 
- `C:\> netsh interface ip add neighbors <interface> <ip> <mac>`
- 
- where `<interface>` is the pretty interface name (e.g. "Local Area Connection"; as displayed by
- `nmrpflash -L`), `<ip>` is the same IP address you'd use for `nmrpflash`'s `-a` flag, and `<mac>`
- is the target device's mac address.
- 
- Cheers to [@ntadmin](https://github.com/ntadmin) for this info!
- </strike>
- 
  ###### "Timeout while waiting for CLOSE_REQ."
  
 -After a successful file upload, `nmrpflash` waits for up to 120 seconds for an
 +After a successful file upload, `nmrpflash` waits for up to 5 minutes for an
  answer from your device. You can increase this by specifying a longer timeout
  using `-T` switch (argument is in seconds).