Minor cosmetics
Implementation for an Issue #295
Fix for an Issue #331
Fix for an --os-pwn with ICMPsh (it was crashing because methods interleaved with Metasploit ones)