added OS detection to nmap scan
final merge