Sniffer improvements...
Merge branch 'master' of git://github.com/Arctium/ArctiumTools