Updated IP address check logic
Merge branch 'ExtraIPChecking'