Merge pull request #295 from dedeckeh/pr_nat46_map