Merge branch 'develop'

# Conflicts:
#	README.md

README.md

@@ -53,7 +53,8 @@ The module uses command line tools for gathering the network information:
 
 * airport on Mac OS-X: `airport -s`
 * netsh on Windows: `netsh wlan show networks mode=Bssid`
-* iwlist (1st choice) on Linux: `iwlist scan`
+* iwlist on Linux: `iwlist scan`
+
 
 Unfortunately, Mac OS-X and Windows use the system language for the output which requires a quite
 generic way of parsing the data. If you experience any troubles, please create a GitHub issue and supply