added check for own packets to avoid them
Merge remote-tracking branch 'origin/master'