restricted available IP ranges a bit to account for subnet/mask IPs
Merge branch 'develop'