Minor updates and cleanup
Merge branch 'master' of github.com:clemensg/pcap