Merge pull request #764 from elken/master

Lots of crap
Fixed driftnet