Merge pull request #444 from dedeckeh/pr_nat46