More IPAddressSupport Fixes
Merge pull request #94 from andylyall/develop

More IPAddressSupport Fixes