simplify and handle /32 and /128
2 files changed