fixed wrong words
fixed warnings
Merge branch 'master' into pcap_inject