Fix range mask calculation.
Add IPs.
Merge remote-tracking branch 'origin/master'