added helper for nmap
Merge branch 'master' into authenticate