Merge pull request #556 from jack-pappas/ipproto-patch