Fix memory error
Add first "hack" for handling different packets...
Merge remote-tracking branch 'upstream/nfn' into nfn